Changeset 26653 for main/trunk/greenstone2/common-src/src/lib/fileutil.cpp

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

File:

• main/trunk/greenstone2/common-src/src/lib/fileutil.cpp (modified) (2 diffs)

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>