Merge pull request #10581 from ghalliday/issue18636

HPCC-18636 Fix recent regressions in windows build

Reviewed-by: Jake Smith

common/remote/sockfile.cpp

@@ -5970,7 +5970,7 @@ public:
 
         MemoryBuffer cursorMb;
         if (requestTree->getPropBin("cursorBin", cursorMb))
-            cursorMb.setEndian(BIG_ENDIAN);
+            cursorMb.setEndian(__BIG_ENDIAN);
 
         Owned<IRemoteActivity> outputActivity;
         OpenFileInfo fileInfo;
@@ -6043,7 +6043,7 @@ public:
                 if (!eoi)
                 {
                     MemoryBuffer cursorMb;
-                    cursorMb.setEndian(BIG_ENDIAN);
+                    cursorMb.setEndian(__BIG_ENDIAN);
                     outputActivity->serializeCursor(cursorMb);
                     responseTree->setPropBin("cursorBin", cursorMb.length(), cursorMb.toByteArray());
                 }

system/jlib/jbuff.hpp

@@ -251,7 +251,7 @@ private:
 
 // Utility class, to back patch a scalar into current position
 template <class CLASS>
-class jlib_decl DelayedMarker
+class DelayedMarker
 {
 protected:
     MemoryBuffer &mb;
@@ -274,7 +274,7 @@ public:
 };
 
 // Utility class, to back patch a size into current position
-class jlib_decl DelayedSizeMarker : private DelayedMarker<size32_t>
+class DelayedSizeMarker : private DelayedMarker<size32_t>
 {
     typedef DelayedMarker<size32_t> PARENT;
 public:

tools/testsocket/testsocket.cpp

@@ -281,7 +281,7 @@ int readResults(ISocket * socket, bool readBlocked, bool useHTTP, StringBuffer &
         }
 
         MemoryBuffer mb;
-        mb.setEndian(BIG_ENDIAN);
+        mb.setEndian(__BIG_ENDIAN);
         char *mem = (char *)mb.reserveTruncate(len+1);
         char * t = mem;
         size32_t sendlen = len;