Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/src/images/utils.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/images/utils.h (modified) (2 diffs)

main/trunk/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 */