Changeset 22257

Timestamp:

2010-06-11T00:44:22+12:00 (14 years ago)

Author:

davidb

Message:

Minor tweak to support MinGW

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/lib/netorder.h (modified) (1 diff)
• mgpp/lib/netorder.h (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mg/lib/netorder.h

@@ -86 +86 @@
     }while(0)
 
+
+#ifdef __MINGW32__
+
+static inline short reverseShort(short s) 
+{    
+  unsigned char c1 = s & 255;
+  unsigned char c2 = (s >> 8) & 255;
+    
+  return (c1 << 8) | c2;
+}
+
+static inline int reverseInt (int i) 
+{
+  unsigned char c1 = i & 255;
+  unsigned char c2 = (i >> 8) & 255;
+  unsigned char c3 = (i >> 16) & 255;
+  unsigned char c4 = (i >> 24) & 255;
+
+  return ((int)c1 << 24) | ((int)c2 << 16) | ((int)c3 << 8) | c4;
+}
+
+#define htonl(l) reverseInt(l)
+#define htons(s) reverseShort(s)
+#define ntohl(l) reverseInt(l)
+#define ntohs(s) reverseShort(s)
+
+#endif
+
 /* pointers */
 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p))

main/trunk/greenstone2/common-src/indexers/mgpp/lib/netorder.h

@@ -85 +85 @@
     }while(0)
 
+#ifdef __MINGW32__
+
+static inline short reverseShort(short s) 
+{    
+  unsigned char c1 = s & 255;
+  unsigned char c2 = (s >> 8) & 255;
+    
+  return (c1 << 8) | c2;
+}
+
+static inline int reverseInt (int i) 
+{
+  unsigned char c1 = i & 255;
+  unsigned char c2 = (i >> 8) & 255;
+  unsigned char c3 = (i >> 16) & 255;
+  unsigned char c4 = (i >> 24) & 255;
+
+  return ((int)c1 << 24) | ((int)c2 << 16) | ((int)c3 << 8) | c4;
+}
+
+#define htonl(l) reverseInt(l)
+#define htons(s) reverseShort(s)
+#define ntohl(l) reverseInt(l)
+#define ntohs(s) reverseShort(s)
+
+#endif
+
+
 /* pointers */
 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p))