Ignore:
Timestamp:
01/10/13 16:05:24 (8 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:
5 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/isis-gdl/Compat.h

    r18881 r26668  
    2424 *********************************************************************/
    2525
    26 #ifndef _WIN32
     26#ifndef _MSC_VER
    2727
    2828#include <string>
  • main/trunk/greenstone2/build-src/packages/isis-gdl/Fdt.cpp

    r6127 r26668  
    5050    for (int i = 0; i < m_nFieldCount; i++)
    5151    {
    52 #ifndef _WIN32
     52#ifndef _MSC_VER
    5353        CFieldDef* p = (CFieldDef*) m_fieldArray[i];
    5454#else
     
    206206{
    207207#ifdef _WIN32
     208  // Not sure why we could have code here that only runs if on Windows
    208209    ustringstream ost;
    209210
     
    232233
    233234    ustring s;
    234 #ifdef _WIN32
     235#ifdef _MSC_VER
    235236    for (i=0; i< m_aFdt.size(); i++)
    236237#else
     
    281282{
    282283    ASSERT(n >= 0 && n <= m_nFieldCount);
    283 #ifndef _WIN32
     284#ifndef _MSC_VER
    284285    return (CFieldDef*) m_fieldArray[n];
    285286#else
     
    298299CFdtEntry CFdt::GetAt(int i)
    299300{
    300 #ifndef _WIN32
     301#ifndef _MSC_VER
    301302    return m_aFdt[i];
    302303#else
     
    311312const CFdtEntry CFdt::GetAt(int i) const
    312313{
    313 #ifndef _WIN32
     314#ifndef _MSC_VER
    314315    return m_aFdt[i];
    315316#else
  • main/trunk/greenstone2/build-src/packages/isis-gdl/Fdt.h

    r6127 r26668  
    131131    CFdtEntry GetEntryAt(int i)
    132132    {
    133       #ifdef _WIN32
     133      #ifdef _MSC_VER
    134134         return m_aFdt.at(i);
    135135      #else
  • main/trunk/greenstone2/build-src/packages/isis-gdl/IsisDef.h

    r7140 r26668  
    8383#endif
    8484
    85 #ifdef _WIN32
     85#ifdef _MSC_VER
    8686#ifndef __DEBUG_H__
    8787#define _DEBUG
     
    126126    {
    127127        m_iError = iError;
    128 #ifdef _WIN32
     128#ifdef _MSC_VER
    129129        AssertFailed(isisExceptionMessage((IsisError) m_iError), file_name, line_number);
    130130#else
  • main/trunk/greenstone2/build-src/packages/isis-gdl/mytchar.h

    r7137 r26668  
    2929#include "tchar.h"
    3030
    31 #ifndef _WIN32
     31#ifndef _MSC_VER
    3232typedef wchar_t TCHAR;
    3333#endif
Note: See TracChangeset for help on using the changeset viewer.