Fixes win_build and VS/cmake build problems

2019-02-11 14:30:15 -05:00
parent d6d244d4d2
commit 3eb9a68783
6 changed files with 5 additions and 14 deletions
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -26,7 +26,7 @@
 #include "text.h"
 #include "enumstxt.h"

-#ifdef WINDOWS
+#ifdef _WIN32
 #define snprintf _snprintf
 #endif

--- a/src/project.c
+++ b/src/project.c
@@ -19,16 +19,8 @@
 #include <stdlib.h>
 #endif

-//*** Need to define WINDOWS to use the getTmpName function ***//
-// --- define WINDOWS
-#undef WINDOWS
+//*** For the Windows SDK _tempnam function ***//
 #ifdef _WIN32
-#define WINDOWS
-#endif
-#ifdef __WIN32__
-#define WINDOWS
-#endif
-#ifdef WINDOWS
 #include <windows.h>
 #endif

--- a/src/report.c
+++ b/src/report.c
@@ -19,9 +19,7 @@
 #include <stdlib.h>
 #endif

-#undef WINDOWS
 #ifdef _WIN32
-#define WINDOWS
 #define snprintf _snprintf
 #endif