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

main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_files.h

@@ -29 +29 @@
 /* Magic numbers for the different types of files */
 
-#define GEN_MAGIC(a,b,c,d) ((unsigned long)(((a)<<24) + ((b)<<16) + \
+#define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \
                         ((c)<<8) + (d)))
 
@@ -55 +55 @@
 #define MAGIC_STEM_3            GEN_MAGIC('M','G','s','3')
 
-#define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
+#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
 
 
@@ -268 +268 @@
    an error message.   */
 FILE *open_named_file (const char *name, const char *mode,
-               u_long magic_num, int err_mode);
+               mg_u_long magic_num, int err_mode);
 
 
@@ -286 +286 @@
    an error message.   */
 FILE *open_file (const char *name, const char *suffix, const char *mode,
-         u_long magic_num, int err_mode);
+         mg_u_long magic_num, int err_mode);
 
 
@@ -305 +305 @@
    an error message.   */
 FILE *create_named_file (const char *name, const char *mode,
-             u_long magic_num, int err_mode);
+             mg_u_long magic_num, int err_mode);
 
 
@@ -322 +322 @@
    an error message.   */
 FILE *create_file (const char *name, const char *suffix, const char *mode,
-           u_long magic_num, int err_mode);
-
-
-
-
-#endif
+           mg_u_long magic_num, int err_mode);
+
+
+
+
+#endif