Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/src/text/comp_dict.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/src/text/comp_dict.c (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/mg/src/text/comp_dict.c

@@ -66 +66 @@
 huff_data char_huff[2];
 huff_data lens_huff[2];
-u_long *char_codes[2], *lens_codes[2];
-u_long Words_disk = 0;
-u_long Chars_disk = 0;
+mg_u_long *char_codes[2], *lens_codes[2];
+mg_u_long Words_disk = 0;
+mg_u_long Chars_disk = 0;
 
 
@@ -79 +79 @@
   dict_hash_table *ht;
   u_char **words;
-  u_long ht_size;
+  mg_u_long ht_size;
 
   ht_size = prime (cfh->hd.num_codes * HASH_RATIO);
@@ -133 +133 @@
       register u_char **wptr;
       register int tsize = ht->size;
-      register unsigned long hashval, step;
+      register mg_u_long hashval, step;
 
       HASH (hashval, step, allwords, tsize);
@@ -163 +163 @@
     return COMPERROR;
 
-  Words_disk = sizeof (u_long);
+  Words_disk = sizeof (mg_u_long);
 
   if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1)