Changeset 23717 for main/branches

Timestamp:

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

Author:

sjm84

Message:

A few more fixes for x64 Greenstone

Location:

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

Files:

• mgfelics.c (modified) (1 diff)
• pbmtools.c (modified) (1 diff)
• utils.c (modified) (3 diffs)
• utils.h (modified) (2 diffs)

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

@@ -55 +55 @@
   FILE *fp_in = (stdin), *fp_out = (stdout);
   int width, height, maxval;
-  u_long magic;
+  mg_u_long magic;
   char *filename = NULL;
   unsigned int *line;

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

@@ -64 +64 @@
 pbm_isapbmfile (FILE * fp)
 {
-  u_long magic;
+  mg_u_long magic;
 
   magic = getmagicno_short (fp);

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.", "");

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

@@ -45 +45 @@
 #define MAGIC_BILEVEL           GEN_MAGIC('M','G','B','I')
 #define MAGIC_TIC               GEN_MAGIC('M','G','T','C')
-#define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
+#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
 /* --------------------------------------- */
 
@@ -68 +68 @@
 void readline (char str[], FILE * fp);
 
-void magic_write (FILE * fp, u_long magic_num);
-void magic_check (FILE * fp, u_long magic_num);
-u_long magic_read (FILE * fp);
+void magic_write (FILE * fp, mg_u_long magic_num);
+void magic_check (FILE * fp, mg_u_long magic_num);
+mg_u_long magic_read (FILE * fp);
 /* kerry's code */