Changeset 26668

Timestamp:

2013-01-10T16:05:24+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/build-src/packages/isis-gdl

Files:

• Compat.h (modified) (1 diff)
• Fdt.cpp (modified) (6 diffs)
• Fdt.h (modified) (1 diff)
• IsisDef.h (modified) (2 diffs)
• mytchar.h (modified) (1 diff)

main/trunk/greenstone2/build-src/packages/isis-gdl/Compat.h

@@ -24 +24 @@
  *********************************************************************/
 
-#ifndef _WIN32
+#ifndef _MSC_VER
 
 #include <string>

main/trunk/greenstone2/build-src/packages/isis-gdl/Fdt.cpp

@@ -50 +50 @@
     for (int i = 0; i < m_nFieldCount; i++)
     {
-#ifndef _WIN32
+#ifndef _MSC_VER
         CFieldDef* p = (CFieldDef*) m_fieldArray[i];
 #else
@@ -206 +206 @@
 {
 #ifdef _WIN32
+  // Not sure why we could have code here that only runs if on Windows
     ustringstream ost;
 
@@ -232 +233 @@
 
     ustring s;
-#ifdef _WIN32
+#ifdef _MSC_VER
     for (i=0; i< m_aFdt.size(); i++)
 #else
@@ -281 +282 @@
 {
     ASSERT(n >= 0 && n <= m_nFieldCount);
-#ifndef _WIN32
+#ifndef _MSC_VER
     return (CFieldDef*) m_fieldArray[n];
 #else
@@ -298 +299 @@
 CFdtEntry CFdt::GetAt(int i)
 {
-#ifndef _WIN32
+#ifndef _MSC_VER
     return m_aFdt[i];
 #else
@@ -311 +312 @@
 const CFdtEntry CFdt::GetAt(int i) const
 {
-#ifndef _WIN32
+#ifndef _MSC_VER
     return m_aFdt[i];
 #else

main/trunk/greenstone2/build-src/packages/isis-gdl/Fdt.h

@@ -131 +131 @@
     CFdtEntry GetEntryAt(int i) 
     { 
-      #ifdef _WIN32
+      #ifdef _MSC_VER
          return m_aFdt.at(i); 
       #else

main/trunk/greenstone2/build-src/packages/isis-gdl/IsisDef.h

@@ -83 +83 @@
 #endif
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #ifndef __DEBUG_H__
 #define _DEBUG
@@ -126 +126 @@
     {
         m_iError = iError;
-#ifdef _WIN32
+#ifdef _MSC_VER
         AssertFailed(isisExceptionMessage((IsisError) m_iError), file_name, line_number);
 #else

main/trunk/greenstone2/build-src/packages/isis-gdl/mytchar.h

@@ -29 +29 @@
 #include "tchar.h"
 
-#ifndef _WIN32
+#ifndef _MSC_VER
 typedef wchar_t TCHAR;
 #endif