Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mgpp/text/locallib.cpp

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/mgpp/text/locallib.cpp (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/text/locallib.cpp

@@ -75 +75 @@
 
 int 
-huffcodebits (unsigned long *A, int n)
+huffcodebits (mg_u_long *A, int n)
 {
   int i, j, tot = 0, bits = 0, v1, v2, *B;
@@ -111 +111 @@
 
 int 
-modelbits (unsigned long *A, int n)
+modelbits (mg_u_long *A, int n)
 {
   int i, bits = 0, last, N = 0;
@@ -159 +159 @@
 
 
-int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * /*mem*/,
-          u_long * disk) {
+int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * /*mem*/,
+          mg_u_long * disk) {
   if (disk)
     (*disk) += sizeof (*cdh);
@@ -185 +185 @@
 
 int 
-Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
+Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
 {
   int i;  /* [RPAP - Jan 97: Endian Ordering] */