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

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

@@ -72 +72 @@
 
 void 
-BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs,
-            unsigned long *bits)
+BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs,
+            mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -84 +84 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
-            unsigned long *bits)
-{
-  register unsigned long val;
+            mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -105 +105 @@
 
 void 
-BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b,
-             stdio_bitio_state * bs, unsigned long *bits)
+BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b,
+             stdio_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -117 +117 @@
 
 
-unsigned long 
-BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs,
-             unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs,
+             mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -138 +138 @@
 
 void 
-BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs,
-            unsigned long *bits)
+BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs,
+            mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -150 +150 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
-            unsigned long *bits)
-{
-  register unsigned long val;
+            mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -168 +168 @@
 
 void 
-BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs,
-            unsigned long *bits)
+BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs,
+            mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -180 +180 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
-            unsigned long *bits)
-{
-  register unsigned long val;
+            mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -198 +198 @@
 
 void 
-BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s,
-            stdio_bitio_state * bs, unsigned long *bits)
+BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s,
+            stdio_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -210 +210 @@
 
 
-unsigned long 
-BIO_Stdio_Elias_Decode (unsigned long b, double s,
+mg_u_long 
+BIO_Stdio_Elias_Decode (mg_u_long b, double s,
             stdio_bitio_state * bs,
-            unsigned long *bits)
-{
-  register unsigned long val;
+            mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -228 +228 @@
 
 void 
-BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b,
-             stdio_bitio_state * bs, unsigned long *bits)
+BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b,
+             stdio_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -240 +240 @@
 
 
-unsigned long 
-BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs,
-             unsigned long *bits)
-{
-  register unsigned long val;
+mg_u_long 
+BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs,
+             mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -255 +255 @@
 
 void 
-BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs)
+BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs)
 {
   DECODE_CONTINUE (*bs)