Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mems.c

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_mems.c (modified) (16 diffs)

main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mems.c

@@ -30 +30 @@
 
 void 
-BIO_Mems_Encode_Start (unsigned char *buf, unsigned long pos,
+BIO_Mems_Encode_Start (unsigned char *buf, mg_u_long pos,
                mems_bitio_state * bs)
 {
@@ -46 +46 @@
 
 void 
-BIO_Mems_Decode_Start (unsigned char *buf, unsigned long pos,
+BIO_Mems_Decode_Start (unsigned char *buf, mg_u_long pos,
                mems_bitio_state * bs)
 {
@@ -57 +57 @@
 
 void 
-BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs,
-               unsigned long *bits)
+BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs,
+               mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -69 +69 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Mems_Unary_Decode (mems_bitio_state * bs,
-               unsigned long *bits)
-{
-  register unsigned long val;
+               mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -90 +90 @@
 
 void 
-BIO_Mems_Binary_Encode (unsigned long val, unsigned long b,
-            mems_bitio_state * bs, unsigned long *bits)
+BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b,
+            mems_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -102 +102 @@
 
 
-unsigned long 
-BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs,
-            unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs,
+            mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -123 +123 @@
 
 void 
-BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs,
-               unsigned long *bits)
+BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs,
+               mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -135 +135 @@
 
 
-unsigned long 
-BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -152 +152 @@
 
 void 
-BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs,
-               unsigned long *bits)
+BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs,
+               mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -164 +164 @@
 
 
-unsigned long 
-BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -178 +178 @@
 
 void 
-BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s,
-               mems_bitio_state * bs, unsigned long *bits)
+BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s,
+               mems_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -190 +190 @@
 
 
-unsigned long 
-BIO_Mems_Elias_Decode (unsigned long b, double s,
-               mems_bitio_state * bs, unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mems_Elias_Decode (mg_u_long b, double s,
+               mems_bitio_state * bs, mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -205 +205 @@
 
 void 
-BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b,
-            mems_bitio_state * bs, unsigned long *bits)
+BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b,
+            mems_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -217 +217 @@
 
 
-unsigned long 
-BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs,
-            unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs,
+            mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -232 +232 @@
 
 void 
-BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs)
+BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs)
 {
   DECODE_CONTINUE (*bs)
@@ -240 +240 @@
 
 void 
-BIO_Mems_Encode_Seek (unsigned long pos, mems_bitio_state * bs)
+BIO_Mems_Encode_Seek (mg_u_long pos, mems_bitio_state * bs)
 {
   ENCODE_CONTINUE (*bs)