Changeset 11873

Show
Ignore:
Timestamp:
08/11/07 13:37:43 (1 year ago)
Author:
mloskot
Message:

Added helpful notes to nmake.opt. Cleaned some inclusion guards according to ISO/C++/17.4.3.1.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal

    • Property svn:ignore changed from
      *~
      *.dll
      *.exe
      *.exp
      *.ilk
      *.lib
      *.ncb
      *.obj
      *.pdb
      *.suo
      *.vcproj.*.user
      *.*.manifest
      config.log
      GDALmake.opt
      libgdal.*
      config.status
      libtool
      autom4te.cache
      Debug
      Release
       to
      *~
      *.dll
      *.exe
      *.exp
      *.ilk
      *.lib
      *.ncb
      *.obj
      *.pdb
      *.suo
      *.vcproj.*.user
      *.*.manifest
      config.log
      GDALmake.opt
      mynmake.opt
      libgdal.*
      config.status
      libtool
      autom4te.cache
      Debug
      Release

  • trunk/gdal/frmts/gtiff/gt_wkt_srs.cpp

    r11697 r11873  
    3333#include "cpl_serv.h" 
    3434#include "geo_tiffp.h" 
    35 #define _CPL_ERROR_H_INCLUDED_ 
     35#define CPL_ERROR_H_INCLUDED 
    3636 
    3737#include "geo_normalize.h" 

  • trunk/gdal/gcore/gdaljp2metadata.h

    r10645 r11873  
    2828 ****************************************************************************/ 
    2929 
    30 #ifndef _JP2READER_H_INCLUDED  
    31 #define _JP2READER_H_INCLUDED  
     30#ifndef GDAL_JP2READER_H_INCLUDED 
     31#define GDAL_JP2READER_H_INCLUDED 
    3232 
    3333#include "cpl_conv.h" 
    …… 
    144144}; 
    145145 
    146  
    147  
    148 #endif /* ndef _JP2READER_H_INCLUDED */ 
    149  
    150  
     146#endif /* ndef GDAL_JP2READER_H_INCLUDED */ 

  • trunk/gdal/nmake.opt

    r11745 r11873  
     1# $Id$ 
    12# 
    2 # Check for additional file to include  
     3# nmake.opt - main configuration file for NMAKE makefiles. 
     4# 
     5############################################################################### 
     6# For convenience, user may put custom settings to private mynmake.opt 
     7# and use EXT_NMAKE_OPT option while calling nmake.exe, as follows: 
     8# 
    39# nmake -f makefile.vc EXT_NMAKE_OPT=mynmake.opt 
    410!IFDEF EXT_NMAKE_OPT 
    …… 
    612!ENDIF 
    713 
     14############################################################################### 
     15# Check version of Visual C++ compiler: 
     16# nmake -f makefile.vc MSVC_VER=xxxx 
     17# where xxxx is one of following: 
     18# 1400 = 8.0 (2005) - specific compilation flags, different from older VC++ 
     19# 1310 = 7.1 (2003) 
     20# 1300 = 7.0 (2002) 
     21# 1200 = 6.0 
    822# 
     23!IFNDEF MSVC_VER 
     24#assume msvc 7.1 
     25MSVC_VER=1310 
     26!ENDIF 
     27 
     28############################################################################### 
    929# Location to install .exe, .dll and python stuff 
    1030# Edit as required. GDAL_HOME is used for convenience here, 
    …… 
    4666JAVA_INCLUDE=-I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32 
    4767 
    48 # Check compiler version given in command line 
    49 # nmake -f makefile.vc MSVC_VER=xxxx 
    50 # 1310 = 7.1 (2003)   1400 = 8.0 (2005) 
    51 # 
    52 !IFNDEF MSVC_VER 
    53 #assume msvc 7.1 
    54 MSVC_VER=1310 
    55 !ENDIF 
    56  
     68# Compilation flags 
    5769!IF $(MSVC_VER) == 1400 
    5870# Uncomment the first for an optimized build or the second for a debug build. 

  • trunk/gdal/ogr/ogr_api.h

    r11460 r11873  
    2828 ****************************************************************************/ 
    2929 
    30 #ifndef _OGR_API_H_INCLUDED 
    31 #define _OGR_API_H_INCLUDED 
     30#ifndef OGR_API_H_INCLUDED 
     31#define OGR_API_H_INCLUDED 
    3232 
    3333/** 
    …… 
    346346CPL_C_END 
    347347 
    348 #endif /* ndef _OGR_API_H_INCLUDED */ 
    349  
    350  
     348#endif /* ndef OGR_API_H_INCLUDED */ 

  • trunk/gdal/ogr/ogr_core.h

    r11030 r11873  
    2828 ****************************************************************************/ 
    2929 
    30 #ifndef _OGR_CORE_H_INCLUDED 
    31 #define _OGR_CORE_H_INCLUDED 
     30#ifndef OGR_CORE_H_INCLUDED 
     31#define OGR_CORE_H_INCLUDED 
    3232 
    3333#include "cpl_port.h" 
    …… 
    301301CPL_C_END 
    302302 
    303 #endif /* ndef _OGR_CORE_H_INCLUDED */ 
    304  
     303#endif /* ndef OGR_CORE_H_INCLUDED */