Fix compilation on GCC-13 (#443)

* Fix compilation on GCC-13

GCC-13 changes internal cstdint includes, and now files that uses
standart integer types should directly include cstdint header.

See: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
Bug: https://bugs.gentoo.org/865117
Bug: https://bugs.gentoo.org/895440

* Convert line endings to Unix format

ixwebsocket/IXBase64.h

@@ -25,6 +25,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <cstdint>
 #include <string>
 
 namespace macaron {

ixwebsocket/IXBench.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <chrono>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 namespace ix

ixwebsocket/IXConnectionState.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <atomic>
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <stdint.h>
 #include <string>
 
 namespace ix

ixwebsocket/IXDNSLookup.h

@@ -12,6 +12,7 @@
 
 #include "IXCancellationRequest.h"
 #include <atomic>
+#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <set>

ixwebsocket/IXHttp.h

@@ -9,6 +9,7 @@
 #include "IXProgressCallback.h"
 #include "IXWebSocketHttpHeaders.h"
 #include <atomic>
+#include <cstdint>
 #include <tuple>
 #include <unordered_map>
 

ixwebsocket/IXHttpClient.cpp

@@ -12,6 +12,7 @@
 #include "IXUserAgent.h"
 #include "IXWebSocketHttpHeaders.h"
 #include <assert.h>
+#include <cstdint>
 #include <cstring>
 #include <iomanip>
 #include <random>

ixwebsocket/IXHttpServer.cpp

@@ -10,6 +10,7 @@
 #include "IXNetSystem.h"
 #include "IXSocketConnect.h"
 #include "IXUserAgent.h"
+#include <cstdint>
 #include <cstring>
 #include <fstream>
 #include <sstream>

ixwebsocket/IXNetSystem.h

@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 #ifdef _WIN32
 
 #ifndef WIN32_LEAN_AND_MEAN

ixwebsocket/IXSelectInterrupt.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
-#include <stdint.h>
 #include <string>
 
 namespace ix

ixwebsocket/IXSelectInterruptEvent.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include "IXSelectInterrupt.h"
+#include <cstdint>
 #include <mutex>
-#include <stdint.h>
 #include <string>
 #include <deque>
 #ifdef _WIN32

ixwebsocket/IXSelectInterruptPipe.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include "IXSelectInterrupt.h"
+#include <cstdint>
 #include <mutex>
 #include <stdint.h>
 #include <string>

ixwebsocket/IXSocket.cpp

@@ -14,7 +14,6 @@
 #include <array>
 #include <assert.h>
 #include <fcntl.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

ixwebsocket/IXSocket.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <atomic>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <mutex>

ixwebsocket/IXSocketMbedTLS.cpp

@@ -14,6 +14,7 @@
 #include "IXNetSystem.h"
 #include "IXSocket.h"
 #include "IXSocketConnect.h"
+#include <cstdint>
 #include <string.h>
 
 #ifdef _WIN32

ixwebsocket/IXUuid.cpp

@@ -16,6 +16,7 @@
 
 #include "IXUuid.h"
 
+#include <cstdint>
 #include <iomanip>
 #include <random>
 #include <sstream>

ixwebsocket/IXWebSocket.cpp

@@ -13,6 +13,7 @@
 #include "IXWebSocketHandshake.h"
 #include <cassert>
 #include <cmath>
+#include <cstdint>
 
 
 namespace

ixwebsocket/IXWebSocket.h

@@ -21,6 +21,7 @@
 #include "IXWebSocketTransport.h"
 #include <atomic>
 #include <condition_variable>
+#include <cstdint>
 #include <mutex>
 #include <string>
 #include <thread>

ixwebsocket/IXWebSocketPerMessageDeflate.cpp

@@ -46,6 +46,8 @@
  *
  */
 
+#include <cstdint>
+
 #include "IXWebSocketPerMessageDeflate.h"
 
 #include "IXUniquePtr.h"

ixwebsocket/IXWebSocketPerMessageDeflateCodec.h

@@ -10,6 +10,7 @@
 #include "zlib.h"
 #endif
 #include <array>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include "IXWebSocketSendData.h"

ixwebsocket/IXWebSocketPerMessageDeflateOptions.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace ix

ixwebsocket/IXWebSocketSendData.h

@@ -1,128 +1,129 @@
-/*
+/*
- *  IXWebSocketSendData.h
+ *  IXWebSocketSendData.h
- *
+ *
- *  WebSocket (Binary/Text) send data buffer
+ *  WebSocket (Binary/Text) send data buffer
- */
+ */
-
+
-#pragma once
+#pragma once
-
+
-#include <string>
+#include <cstdint>
-#include <vector>
+#include <string>
-#include <iterator>
+#include <vector>
-
+#include <iterator>
-namespace ix
+
-{
+namespace ix
-    /*
+{
-    * IXWebSocketSendData implements a wrapper for std::string, std:vector<char/uint8_t> and char*.
+    /*
-    * It removes the necessarity to copy the data or string into a std::string 
+    * IXWebSocketSendData implements a wrapper for std::string, std:vector<char/uint8_t> and char*.
-    */
+    * It removes the necessarity to copy the data or string into a std::string 
-    class IXWebSocketSendData {
+    */
-    public:
+    class IXWebSocketSendData {
-
+    public:
-        template<typename T>
+
-        struct IXWebSocketSendData_const_iterator
+        template<typename T>
-            //: public std::iterator<std::forward_iterator_tag, T>
+        struct IXWebSocketSendData_const_iterator
-        {
+            //: public std::iterator<std::forward_iterator_tag, T>
-            typedef IXWebSocketSendData_const_iterator<T> const_iterator;
+        {
-
+            typedef IXWebSocketSendData_const_iterator<T> const_iterator;
-            using iterator_category = std::forward_iterator_tag;
+
-            using difference_type = std::ptrdiff_t;
+            using iterator_category = std::forward_iterator_tag;
-            using value_type = T;
+            using difference_type = std::ptrdiff_t;
-            using pointer = value_type*;
+            using value_type = T;
-            using reference = const value_type&;
+            using pointer = value_type*;
-
+            using reference = const value_type&;
-            pointer _ptr;
+
-        public:
+            pointer _ptr;
-            IXWebSocketSendData_const_iterator() : _ptr(nullptr) {}
+        public:
-            IXWebSocketSendData_const_iterator(pointer ptr) : _ptr(ptr) {}
+            IXWebSocketSendData_const_iterator() : _ptr(nullptr) {}
-            ~IXWebSocketSendData_const_iterator() {}
+            IXWebSocketSendData_const_iterator(pointer ptr) : _ptr(ptr) {}
-
+            ~IXWebSocketSendData_const_iterator() {}
-            const_iterator  operator++(int) { return const_iterator(_ptr++); }
+
-            const_iterator& operator++() { ++_ptr; return *this; }
+            const_iterator  operator++(int) { return const_iterator(_ptr++); }
-            reference       operator* () const { return *_ptr; }
+            const_iterator& operator++() { ++_ptr; return *this; }
-            pointer         operator->() const { return _ptr; }
+            reference       operator* () const { return *_ptr; }
-            const_iterator  operator+ (const difference_type offset) const { return const_iterator(_ptr + offset); }
+            pointer         operator->() const { return _ptr; }
-            const_iterator  operator- (const difference_type offset) const { return const_iterator(_ptr - offset); }
+            const_iterator  operator+ (const difference_type offset) const { return const_iterator(_ptr + offset); }
-            difference_type operator- (const const_iterator& rhs) const { return _ptr - rhs._ptr; }
+            const_iterator  operator- (const difference_type offset) const { return const_iterator(_ptr - offset); }
-            bool            operator==(const const_iterator& rhs) const { return _ptr == rhs._ptr; }
+            difference_type operator- (const const_iterator& rhs) const { return _ptr - rhs._ptr; }
-            bool            operator!=(const const_iterator& rhs) const { return _ptr != rhs._ptr; }
+            bool            operator==(const const_iterator& rhs) const { return _ptr == rhs._ptr; }
-            const_iterator& operator+=(const difference_type offset) { _ptr += offset; return *this; }
+            bool            operator!=(const const_iterator& rhs) const { return _ptr != rhs._ptr; }
-            const_iterator& operator-=(const difference_type offset) { _ptr -= offset; return *this; }
+            const_iterator& operator+=(const difference_type offset) { _ptr += offset; return *this; }
-        };
+            const_iterator& operator-=(const difference_type offset) { _ptr -= offset; return *this; }
-
+        };
-        using const_iterator = IXWebSocketSendData_const_iterator<char>;
+
-
+        using const_iterator = IXWebSocketSendData_const_iterator<char>;
-        /* The assigned std::string must be kept alive for the lifetime of the input buffer */
+
-        IXWebSocketSendData(const std::string& str)
+        /* The assigned std::string must be kept alive for the lifetime of the input buffer */
-            : _data(str.data())
+        IXWebSocketSendData(const std::string& str)
-            , _size(str.size())
+            : _data(str.data())
-        {
+            , _size(str.size())
-        }
+        {
-
+        }
-        /* The assigned std::vector must be kept alive for the lifetime of the input buffer */
+
-        IXWebSocketSendData(const std::vector<char>& v)
+        /* The assigned std::vector must be kept alive for the lifetime of the input buffer */
-            : _data(v.data())
+        IXWebSocketSendData(const std::vector<char>& v)
-            , _size(v.size())
+            : _data(v.data())
-        {
+            , _size(v.size())
-        }
+        {
-
+        }
-        /* The assigned std::vector must be kept alive for the lifetime of the input buffer */
+
-        IXWebSocketSendData(const std::vector<uint8_t>& v)
+        /* The assigned std::vector must be kept alive for the lifetime of the input buffer */
-            : _data(reinterpret_cast<const char*>(v.data()))
+        IXWebSocketSendData(const std::vector<uint8_t>& v)
-            , _size(v.size())
+            : _data(reinterpret_cast<const char*>(v.data()))
-        {
+            , _size(v.size())
-        }
+        {
-
+        }
-        /* The assigned memory must be kept alive for the lifetime of the input buffer */
+
-        IXWebSocketSendData(const char* data, size_t size)
+        /* The assigned memory must be kept alive for the lifetime of the input buffer */
-            : _data(data)
+        IXWebSocketSendData(const char* data, size_t size)
-            , _size(data == nullptr ? 0 : size)
+            : _data(data)
-        {
+            , _size(data == nullptr ? 0 : size)
-        }
+        {
-
+        }
-        bool empty() const
+
-        {
+        bool empty() const
-            return _data == nullptr || _size == 0;
+        {
-        }
+            return _data == nullptr || _size == 0;
-
+        }
-        const char* c_str() const
+
-        {
+        const char* c_str() const
-            return _data;
+        {
-        }
+            return _data;
-
+        }
-        const char* data() const
+
-        {
+        const char* data() const
-            return _data;
+        {
-        }
+            return _data;
-
+        }
-        size_t size() const
+
-        {
+        size_t size() const
-            return _size;
+        {
-        }
+            return _size;
-
+        }
-        inline const_iterator begin() const
+
-        {
+        inline const_iterator begin() const
-            return const_iterator(const_cast<char*>(_data));
+        {
-        }
+            return const_iterator(const_cast<char*>(_data));
-
+        }
-        inline const_iterator end() const
+
-        {
+        inline const_iterator end() const
-            return const_iterator(const_cast<char*>(_data) + _size);
+        {
-        }
+            return const_iterator(const_cast<char*>(_data) + _size);
-
+        }
-        inline const_iterator cbegin() const
+
-        {
+        inline const_iterator cbegin() const
-            return begin();
+        {
-        }
+            return begin();
-
+        }
-        inline const_iterator cend() const
+
-        {
+        inline const_iterator cend() const
-            return end();
+        {
-        }
+            return end();
-
+        }
-    private:
+
-        const char* _data;
+    private:
-        const size_t _size;
+        const char* _data;
-    };
+        const size_t _size;
-
+    };
+
 }

ixwebsocket/IXWebSocketTransport.cpp

@@ -45,7 +45,6 @@
 #include <cstdarg>
 #include <cstdlib>
 #include <sstream>
-#include <stdlib.h>
 #include <string.h>
 #include <string>
 #include <thread>

ixwebsocket/IXWebSocketTransport.h

@@ -21,6 +21,7 @@
 #include "IXWebSocketSendData.h"
 #include "IXWebSocketSendInfo.h"
 #include <atomic>
+#include <cstdint>
 #include <functional>
 #include <list>
 #include <memory>