Changeset 35553

Timestamp:

2021-10-12T11:17:26+13:00 (3 years ago)

Author:

davidb

Message:

Another change associated with compiling up Greenstone/MG on Window 64-bit. Here the #ifdef test that allowed for the use of 64-long types had been written to only trigger when using gcc, implying a Unix mindset, and that 64-bit Windows hadn't been considered

File:

• main/trunk/greenstone2/common-src/indexers/mg/lib/longlong.h (modified) (2 diffs)

main/trunk/greenstone2/common-src/indexers/mg/lib/longlong.h

@@ -59 +59 @@
 #define LL_FS "d"
 
-#elif defined __GNUC__ && ! defined DISABLE_LONG_LONG
 
-/* We're using GCC, so it's okay to use "long long" (64-bit) types */
+#elif ! defined DISABLE_LONG_LONG
+
 #define USE_LONG_LONG
 
-typedef unsigned long long int mg_ullong;
-typedef long long int mg_llong;
+#ifndef mg_ullong
+#define mg_ullong uint64_t
+#endif
+
+#ifndef mg_llong
+#define mg_llong int64_t
+#endif
 
 #define ULL_FS "llu"
 #define LL_FS "lld"
 
+
 #else
 
-/* Not using GCC, so fall back on plain "long" (32-bit) types */
+#warning MG LONG_LONG disable.  Using 32-bit versions for mg_ulong and mg_llong
+#warning If the MG code makes use of this type when reading or writing out index/binary data then it is not guaranteed that these files can be transferred to another computer where MG has been installed
+
+/* Fall back on plain "long" (32-bit) types */
 typedef uint32_t mg_ullong;
 typedef int32_t mg_llong;
@@ -79 +88 @@
 #define LL_FS "d"
 
-#endif /* __GNUC__ */
+#endif
 
 #endif