Changeset 23508 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/gmalloc.c

Timestamp:

2010-12-17T14:04:10+13:00 (13 years ago)

Author:

sjm84

Message:

Committing 64 bit changes into the branch

File:

• main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/gmalloc.c (modified) (5 diffs)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/gmalloc.c

@@ -401 +401 @@
 {
   __ptr_t result;
-  unsigned long int adj;
+  mg_u_long adj;
 
   result = (*__morecore) (size);
-  adj = (unsigned long int) ((unsigned long int) ((char *) result -
+  adj = (mg_u_long) ((mg_u_long) ((char *) result -
                           (char *) NULL)) % BLOCKSIZE;
   if (adj != 0)
@@ -549 +549 @@
       block = BLOCK (result);
       if (--_heapinfo[block].busy.info.frag.nfree != 0)
-        _heapinfo[block].busy.info.frag.first = (unsigned long int)
-          ((unsigned long int) ((char *) next->next - (char *) NULL)
+        _heapinfo[block].busy.info.frag.first = (mg_u_long)
+          ((mg_u_long) ((char *) next->next - (char *) NULL)
            % BLOCKSIZE) >> log;
 
@@ -872 +872 @@
       prev = (struct list *) ptr;
       _heapinfo[block].busy.info.frag.nfree = 1;
-      _heapinfo[block].busy.info.frag.first = (unsigned long int)
-        ((unsigned long int) ((char *) ptr - (char *) NULL)
+      _heapinfo[block].busy.info.frag.first = (mg_u_long)
+        ((mg_u_long) ((char *) ptr - (char *) NULL)
          % BLOCKSIZE >> type);
       prev->next = _fraghead[type].next;
@@ -1284 +1284 @@
 {
   __ptr_t result;
-  unsigned long int adj;
+  mg_u_long int adj;
 
   size = ((size + alignment - 1) / alignment) * alignment;
@@ -1291 +1291 @@
   if (result == NULL)
     return NULL;
-  adj = (unsigned long int) ((unsigned long int) ((char *) result -
+  adj = (mg_u_long) ((mg_u_long) ((char *) result -
                           (char *) NULL)) % alignment;
   if (adj != 0)