Changeset 26650 for main/trunk

Timestamp:

2013-01-10T15:25:03+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/gdbmedit

Files:

• db2txt/db2txt.cpp (modified) (2 diffs)
• gdbmdel/gdbmdel.cpp (modified) (2 diffs)
• gdbmget/gdbmget.cpp (modified) (2 diffs)
• gdbmkeys/gdbmkeys.cpp (modified) (2 diffs)
• gdbmset/gdbmset.cpp (modified) (2 diffs)
• txt2db/txt2db.cpp (modified) (2 diffs)

main/trunk/greenstone2/common-src/src/gdbmedit/db2txt/db2txt.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
 #include "autoconf.h"
 #include "systems.h"
@@ -71 +71 @@
   
   // open the database
-#ifdef __WIN32__
+#ifdef _MSC_VER
   dbf = gdbm_open (argv[1], block_size, GDBM_READER, 00664, NULL, 0);
 #else

main/trunk/greenstone2/common-src/src/gdbmedit/gdbmdel/gdbmdel.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
 #include "autoconf.h"
 #include "systems.h"
@@ -77 +77 @@
   
   // open the database
-#ifdef __WIN32__
+#ifdef _MSC_VER
   dbf = gdbm_open (argv[1], block_size, GDBM_WRCREAT, 00664, NULL, 1);
 #else

main/trunk/greenstone2/common-src/src/gdbmedit/gdbmget/gdbmget.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
 #include "autoconf.h"
 #include "systems.h"
@@ -77 +77 @@
   
   // open the database
-#ifdef __WIN32__
+#ifdef _MSC_VER
   dbf = gdbm_open (argv[1], block_size, GDBM_READER, 00664, NULL, 0);
 #else

main/trunk/greenstone2/common-src/src/gdbmedit/gdbmkeys/gdbmkeys.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
 #include "autoconf.h"
 #include "systems.h"
@@ -76 +76 @@
   
   // open the database
-#ifdef __WIN32__
+#ifdef _MSC_VER
   dbf = gdbm_open (argv[1], block_size, GDBM_READER, 00664, NULL, 0);
 #else

main/trunk/greenstone2/common-src/src/gdbmedit/gdbmset/gdbmset.cpp

@@ -24 +24 @@
  *********************************************************************/
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
 #include "autoconf.h"
 #include "systems.h"
@@ -81 +81 @@
   
   // open the database
-#ifdef __WIN32__
+#ifdef _MSC_VER
   // On Windows need to make sure the database is generated if it does not already exist
   // GDBM_WRCREAT flag means: open database for read/write, create if necessary

main/trunk/greenstone2/common-src/src/gdbmedit/txt2db/txt2db.cpp

@@ -25 +25 @@
 
 
-#ifdef __WIN32__
+#ifdef _MSC_VER
 #include "autoconf.h"
 #include "systems.h"
@@ -95 +95 @@
   if (append) read_write = GDBM_WRCREAT | GDBM_FAST;
   
-#ifdef __WIN32__
+#ifdef _MSC_VER
   dbf = gdbm_open (dbname, block_size, read_write, 00664, NULL, 1);
 #else