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

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

@@ -47 +47 @@
 
 static File *
-OpenFile (char *base, char *suffix, unsigned long magic, int *ok)
+OpenFile (char *base, char *suffix, mg_u_long magic, int *ok)
 {
   char FileName[512];
@@ -62 +62 @@
   if (magic)
     {
-      unsigned long m;
+      mg_u_long m;
       if (fread ((char *) &m, sizeof (m), 1, F->f) == 0)
     {
@@ -475 +475 @@
   if (qd->id->ifh.InvfLevel == 3)
     {
-      unsigned long magic;
+      mg_u_long magic;
       FILE *paragraph;
       int i;
@@ -507 +507 @@
   {
     extern char *trec_ids;
-    extern long *trec_paras;
+    extern mg_s_long *trec_paras;
     int size;
     char FileName[512];
@@ -533 +533 @@
       {
     int i, d;
-    unsigned long magic;
-    trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (long));
+    mg_u_long magic;
+    trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (mg_s_long));
     if (!trec_paras)
       {
@@ -598 +598 @@
  */
 void 
-ChangeMemInUse (query_data * qd, long delta)
+ChangeMemInUse (query_data * qd, mg_s_long delta)
 {
   qd->mem_in_use += delta;
@@ -775 +775 @@
 }
 
-long 
+mg_s_long 
 GetDocCompLength (query_data * qd)
 {
@@ -785 +785 @@
 
 u_char *
-GetDocText (query_data * qd, unsigned long *len)
+GetDocText (query_data * qd, mg_u_long *len)
 {
   DocEntry *DE;