aboutsummaryrefslogtreecommitdiff
path: root/src/projects.h
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2007-03-11 17:03:18 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2007-03-11 17:03:18 +0000
commit89d7239332e73cb6e5b2afee5e01cfc18fff91f9 (patch)
tree5feb648adad7cd50e419fd1d8cd3bb2fea928277 /src/projects.h
parent6c82df1cb408bf513a916c4c3428ec00619ce7f0 (diff)
downloadPROJ-89d7239332e73cb6e5b2afee5e01cfc18fff91f9.tar.gz
PROJ-89d7239332e73cb6e5b2afee5e01cfc18fff91f9.zip
support drive letter prefixes on win32 and related fixes (bug 1499)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1392 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/projects.h')
-rw-r--r--src/projects.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/projects.h b/src/projects.h
index a8e6e28e..660c4a3b 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -28,6 +28,9 @@
******************************************************************************
*
* $Log$
+ * Revision 1.26 2007/03/11 17:03:18 fwarmerdam
+ * support drive letter prefixes on win32 and related fixes (bug 1499)
+ *
* Revision 1.25 2006/11/17 22:16:30 mloskot
* Uploaded PROJ.4 port for Windows CE.
*
@@ -176,8 +179,17 @@ extern double hypot(double, double);
#define ID_TAG_MAX 50
#endif
+/* Use WIN32 as a standard windows 32 bit declaration */
+#if defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE)
+# define WIN32
+#endif
+
+#if defined(_WINDOWS) && !defined(WIN32) && !defined(_WIN32_WCE)
+# define WIN32
+#endif
+
/* directory delimiter for DOS support */
-#ifdef DOS
+#ifdef WIN32
#define DIR_CHAR '\\'
#else
#define DIR_CHAR '/'