Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mem.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_mem.c (modified) (13 diffs)

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

@@ -55 +55 @@
 
 void 
-BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs,
-              unsigned long *bits)
+BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs,
+              mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -67 +67 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Mem_Unary_Decode (mem_bitio_state * bs,
-              unsigned long *bits)
-{
-  register unsigned long val;
+              mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -88 +88 @@
 
 void 
-BIO_Mem_Binary_Encode (unsigned long val, unsigned long b,
-               mem_bitio_state * bs, unsigned long *bits)
+BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b,
+               mem_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -100 +100 @@
 
 
-unsigned long 
-BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs,
-               unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs,
+               mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -121 +121 @@
 
 void 
-BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs,
-              unsigned long *bits)
+BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs,
+              mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -133 +133 @@
 
 
-unsigned long 
-BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -150 +150 @@
 
 void 
-BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs,
-              unsigned long *bits)
+BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs,
+              mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -162 +162 @@
 
 
-unsigned long 
-BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -176 +176 @@
 
 void 
-BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s,
-              mem_bitio_state * bs, unsigned long *bits)
+BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s,
+              mem_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -188 +188 @@
 
 
-unsigned long 
-BIO_Mem_Elias_Decode (unsigned long b, double s,
-              mem_bitio_state * bs, unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mem_Elias_Decode (mg_u_long b, double s,
+              mem_bitio_state * bs, mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -203 +203 @@
 
 void 
-BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b,
-               mem_bitio_state * bs, unsigned long *bits)
+BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b,
+               mem_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -215 +215 @@
 
 
-unsigned long 
-BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs,
-               unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs,
+               mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -230 +230 @@
 
 void 
-BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs)
+BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs)
 {
   DECODE_CONTINUE (*bs)