Now builds on Windows under Visual Studio 2022

We still have lots of warnings.
Trio-Motion-Technology · Feb 6, 2024 · b6a5343 · b6a5343
1 parent 2c765de
commit b6a5343
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/source/src/byte_bufs.h b/source/src/byte_bufs.h
@@ -33,7 +33,7 @@ class ByteBuf
 
     uint8_t*    data() const    { return start; }
     uint8_t*    end() const     { return limit; }
-    ssize_t     size() const    { return limit - start; }   // ssize_t is signed
+    uint16_t     size() const    { return limit - start; }   // uint16_t is signed
 
 protected:
     uint8_t*    start;
@@ -72,7 +72,7 @@ class BufWriter
     /// Return the unused size of the buffer, the remaining capacity which is empty.
     /// A negative value would indicate an overrun, but that also indicates a bug in
     /// in this class because protections are everywhere to prevent overruns.
-    ssize_t     capacity() const    { return limit - start; }
+    uint16_t     capacity() const    { return limit - start; }
 
     /// Advance the start of the buffer by the specified number of bytes and trim
     /// the capacity().
@@ -174,7 +174,7 @@ class BufReader
     /// in the buffer.
     /// A negative value would indicate an overrun, but that also indicates a bug in
     /// in this class because protections are everywhere to prevent overruns.
-    ssize_t     size() const        { return limit - start; }
+    uint16_t     size() const        { return limit - start; }
 
     /// Advance the start of the buffer by the specified number of bytes and trim
     /// the size().

diff --git a/source/src/cip/cipconnection.cc b/source/src/cip/cipconnection.cc
@@ -1231,7 +1231,11 @@ void CipConn::GeneralConfiguration( ConnectionData* aConnData, ConnInstanceType
     // "expected_packet_rate x connection_timeout_multiplier".  Initial value
     // is called a "pre-consumption" timeout value.
     if( RxTimeoutUSecs() )
+#ifdef _MSC_VER
+        SetInactivityWatchDogTimerUSecs(max(RxTimeoutUSecs(), 10000000u));
+#else
         SetInactivityWatchDogTimerUSecs( std::max( RxTimeoutUSecs(), 10000000u ) );
+#endif
     else
     {
         // this is not an erro

diff --git a/source/src/enet_encap/encap.cc b/source/src/enet_encap/encap.cc
@@ -416,8 +416,11 @@ static int disposeOfLargePacket( int aSocket, unsigned aCount )
     while( aCount )
     {
         // toss in chunks.
+#ifdef _MSC_VER
+        int readz = min(aCount, unsigned(sizeof chunk));
+#else
         int readz = std::min( aCount, unsigned( sizeof chunk ) );
-
+#endif
         int num_read = Encapsulation::EnsuredTcpRecv( aSocket, chunk, readz );
 
         if( num_read != readz )