Changeset 26653

Timestamp:

2013-01-10T15:32:53+13:00 (11 years ago)

Author:

davidb

Message:

Code changed from using WIN32 use to _MSC_VER (the difference being the former is set for any Windows based compiler, whilst the latter is specifically set by a MicroSoft Visual Studio compiler). Up to this point the difference was not important, however to allow for cross-compilation (using mingw under Linux to produce native Windows binaries) the difference is imporant, and needs to be used more carefully

Location:

main/trunk/greenstone2/common-src/src/lib

Files:

• fileutil.cpp (modified) (2 diffs)
• gdbmclass.cpp (modified) (2 diffs)
• gdbmclass.h (modified) (1 diff)
• gsdlconf.h (modified) (1 diff)
• gsdlsysfuncs.h (modified) (1 diff)
• gsdltools.cpp (modified) (1 diff)
• gsdltools.h (modified) (1 diff)

main/trunk/greenstone2/common-src/src/lib/fileutil.cpp

@@ -379 +379 @@
   bool fail = false;
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
+  // Use this block of code only for compilation under Windows 
+  // with MS Visual Studio.  Copilation under Windows with a compiler
+  // like minGW needs to go to the 'else' block
+
   if (CopyFile (fromfilec, tofilec, FALSE) == 0) fail = true;
 
@@ -468 +472 @@
 }
 
-#ifdef __WIN32__
+#if defined(__WIN32__)
 
 #include <direct.h>

main/trunk/greenstone2/common-src/src/lib/gdbmclass.cpp

@@ -46 +46 @@
 // returns true if opened
 bool gdbmclass::opendatabase (const text_t &filename, int mode, int num_retrys, 
-#ifdef __WIN32__
+#ifdef __MSC_VER__
                   bool need_filelock
 #else
@@ -105 +105 @@
   char *namebuffer = gdbm_filename.getcstr();
   do {
-#ifdef __WIN32__
+#ifdef __MSC_VER__
     gdbmfile = gdbm_open (namebuffer, block_size, gdbm_mode, 00664, NULL, (need_filelock) ? 1 : 0);
 #else

main/trunk/greenstone2/common-src/src/lib/gdbmclass.h

@@ -31 +31 @@
 #include "dbclass.h"
 
-#ifdef __WIN32__
+#ifdef __MSC_VER__
 
 #ifdef __cplusplus

main/trunk/greenstone2/common-src/src/lib/gsdlconf.h

@@ -36 +36 @@
 #endif
 
-#if defined(__WIN32__) && !defined(__CYGWIN__)
+#if defined(__MSC_VER_) 
 #include "../../win32cfg.h"
 #else

main/trunk/greenstone2/common-src/src/lib/gsdlsysfuncs.h

@@ -5 +5 @@
 
 #ifdef HAVE_CONFIG_H
-# ifdef __WIN32__
+# ifdef __MSC_VER__
 #  include <win32cfg.h>
 # else

main/trunk/greenstone2/common-src/src/lib/gsdltools.cpp

@@ -281 +281 @@
 
 
-#if defined(__WIN32__)
+#if defined(__MSC_VER__)
 // A very useful function to call to debug mysterious heap memory errors when
 // their cause isn't clear in the Vis Studio debugger. Call it from various 

main/trunk/greenstone2/common-src/src/lib/gsdltools.h

@@ -73 +73 @@
 bool perl_ok (ostream &logout);
 
-#if defined(__WIN32__)
+#if defined(_MSC_VER)
 void check_system_heap(char* title);
 #endif