Changeset 23717 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.c

Timestamp:

2011-02-17T11:00:10+13:00 (13 years ago)

Author:

sjm84

Message:

A few more fixes for x64 Greenstone

File:

• main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.c (modified) (3 diffs)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.c

@@ -230 +230 @@
 
 void 
-magic_write (FILE * fp, u_long magic_num)
+magic_write (FILE * fp, mg_u_long magic_num)
 {
   HTONUL(magic_num);  /* [RPAP - Jan 97: Endian Ordering] */
@@ -239 +239 @@
 
 void 
-magic_check (FILE * fp, u_long magic_num)
-{
-  u_long magic;
+magic_check (FILE * fp, mg_u_long magic_num)
+{
+  mg_u_long magic;
   if (fread (&magic, sizeof (magic), 1, fp) != 1 || NTOHUL(magic) != magic_num)  /* [RPAP - Jan 97: Endian Ordering] */
     error_msg ("magic num", "Incorrect magic number.", "");
@@ -247 +247 @@
 
 
-u_long 
+mg_u_long 
 magic_read (FILE * fp)
 {
-  u_long magic;
+  mg_u_long magic;
   if (fread (&magic, sizeof (magic), 1, fp) != 1)
     error_msg ("magic num", "Couldn't read magic number.", "");