Changeset 25492

Timestamp:

2012-04-26T18:11:56+12:00 (12 years ago)

Author:

ak19

Message:

Joshua Scarsbrook found that compilation failed on Macs (he was compiling GS3, but the compilation failed in GS2 code) and that this had to do with unix not being defined on macs, so that the compiler went on to the Windows part of the hash-definition and then failed. Dr Bainbridge found there was an equivalent APPLE definition which would be true for all Mac operating systems (including iPhones).

Location:

main/trunk/greenstone2/common-src

Files:

• indexers/mg/lib/mglong.h (modified) (1 diff)
• indexers/mgpp/lib/longlong.h (modified) (1 diff)
• indexers/mgpp/lib/mglong.h (modified) (1 diff)
• packages/gdbm/gdbm-1.8.3/gdbmdefs.h (modified) (1 diff)

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

@@ -2 +2 @@
 #define MGLONG_H
 
-#ifdef __unix__
+// See http://stackoverflow.com/questions/6802903/c-ifdef-mac-os-x-question
+// and http://stackoverflow.com/questions/5919996/how-to-detect-reliably-mac-os-x-ios-linux-windows-in-c-preprocessor
+#if defined __unix__ || defined __APPLE__
 #include <stdint.h>
 #else

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

@@ -74 +74 @@
 #else
 
-#ifdef __unix__
+#if defined __unix__ || defined __APPLE__
 #include <stdint.h>
 #else

main/trunk/greenstone2/common-src/indexers/mgpp/lib/mglong.h

@@ -2 +2 @@
 #define MGLONG_H
 
-#ifdef __unix__
+#if defined __unix__ || defined __APPLE__
 #include <stdint.h>
 #else

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/gdbmdefs.h

@@ -33 +33 @@
    The following ensures that we use the same for all systems, and so lets
    GDBM read the same database files */
-#ifdef __unix__
+#if defined __unix__ || defined __APPLE__
 #include <stdint.h>
 #else