Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/src/text/text.h

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/text.h (modified) (6 diffs)

main/trunk/greenstone2/common-src/indexers/mg/src/text/text.h

@@ -117 +117 @@
 typedef struct compression_dict_header
   {
-    u_long dict_type;
-    u_long novel_method;
-    u_long params[TEXT_PARAMS];
-    u_long num_words[2];
-    u_long num_word_chars[2];
-    u_long lookback;
+    mg_u_long dict_type;
+    mg_u_long novel_method;
+    mg_u_long params[TEXT_PARAMS];
+    mg_u_long num_words[2];
+    mg_u_long num_word_chars[2];
+    mg_u_long lookback;
   }
 compression_dict_header;
@@ -130 +130 @@
   {
     huff_data hd;
-    u_long uncompressed_size;
-    u_long huff_words_size[MAX_HUFFCODE_LEN + 1];
+    mg_u_long uncompressed_size;
+    mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1];
   }
 comp_frags_header;
@@ -139 +139 @@
 typedef struct compressed_text_header
   {
-    u_long num_of_docs;
-    u_long num_of_words;    /* number of words in collection */
+    mg_u_long num_of_docs;
+    mg_u_long num_of_words; /* number of words in collection */
     double num_of_bytes; /* [RJM 07/97: 4G limit] */
     double ratio;
-    u_long length_of_longest_doc;   /* (characters) */
-    u_long dummy;    /* added to make the structure the same on different architectures */
+    mg_u_long length_of_longest_doc;    /* (characters) */
+    mg_u_long dummy;    /* added to make the structure the same on different architectures */
   }
 compressed_text_header;
@@ -151 +151 @@
 typedef struct compression_stats_header
   {
-    u_long num_docs;
-    u_long dummy;   /* added to make the structure the same on different architectures */
+    mg_u_long num_docs;
+    mg_u_long dummy;   /* added to make the structure the same on different architectures */
     double num_bytes; /* [RJM 07/97: 4G limit] */
   }
@@ -160 +160 @@
 typedef struct frags_stats_header
   {
-    u_long num_frags;
-    u_long mem_for_frags;
+    mg_u_long num_frags;
+    mg_u_long mem_for_frags;
   }
 frags_stats_header;
@@ -168 +168 @@
 typedef struct aux_frags_header
   {
-    u_long num_frags;
-    u_long mem_for_frags;
+    mg_u_long num_frags;
+    mg_u_long mem_for_frags;
   }
 aux_frags_header;