Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m_mems.h

Timestamp:

2012-02-28T13:59:00+13:00 (12 years ago)

Author:

kjdon

Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:

• main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m_mems.h (modified) (3 diffs)

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

@@ -36 +36 @@
   {
     unsigned char *Base;
-    unsigned long pos;
+    mg_u_long pos;
   }
 mems_bitio_state;
@@ -44 +44 @@
   {                                 \
     register unsigned char *__base = b;                 \
-    register unsigned long __pos = p;
+    register mg_u_long __pos = p;
 
 #define ENCODE_CONTINUE(b)                      \
   {                                 \
     register unsigned char *__base = (b).Base;              \
-    register unsigned long __pos = (b).pos;
+    register mg_u_long __pos = (b).pos;
 
 #define ENCODE_BIT(b)                           \
@@ -76 +76 @@
   {                                 \
     register unsigned char *__base = b;                 \
-    register unsigned long __pos = p;
+    register mg_u_long __pos = p;
 
 #define DECODE_CONTINUE(b)                      \
   {                                 \
     register unsigned char *__base = (b).Base;              \
-    register unsigned long __pos = (b).pos;
+    register mg_u_long __pos = (b).pos;
 
 #define DECODE_ADD_FF(b)                        \