Changeset 29051 for main/trunk/greenstone2/common-src/indexers

Timestamp:

2014-05-12T17:53:02+12:00 (10 years ago)

Author:

ak19

Message:

Dr Bainbridge made some fixes to header file inclusions so that when compiling with Visual Studio 12 (2013) on Windows (64 bit), GS2 still compiles successfully

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/lib/mglong.h (modified) (1 diff)
• mgpp/lib/longlong.h (modified) (1 diff)
• mgpp/lib/mglong.h (modified) (1 diff)
• mgpp/lib/sysfuncs.h (modified) (1 diff)

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

@@ -4 +4 @@
 #define MGLONG_H
 
-#if defined __unix__ || defined __APPLE__ || defined __MINGW32__
+#if defined __unix__ || defined __APPLE__ || defined __MINGW32__ || (_MSC_VER >= 1800)
 #include <stdint.h>
 #else

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

@@ -74 +74 @@
 #else
 
-#if defined __unix__ || defined __APPLE__
+#if defined __unix__ || defined __APPLE__ || defined __MINGW32__ || (_MSC_VER >= 1800)
 #include <stdint.h>
 #else

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

@@ -2 +2 @@
 #define MGLONG_H
 
-#if defined __unix__ || defined __APPLE__ || defined __MINGW32__
+#if defined __unix__ || defined __APPLE__ || defined __MINGW32__ || (_MSC_VER >= 1800)
 #include <stdint.h>
 #else

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

@@ -64 +64 @@
  */
 #include <stdlib.h>
-#include <math.h>
+
+#if defined(GSDL_USE_IOS_H)
+#  include <math.h>
+#else
+// Newer Visual Studio compilers (e.g., VS12) prefer the 
+// math's header file to be included this way
+#  include <cmath>
+#endif
+
+
 
 #ifndef log2