make cpp defines more portable

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4/program@2238 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index d0340c8784cf79d27b8dd323cf4ac663005f80e6..71072b0919911b9f9553145026dca550824b61e7 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -416,7 +416,7 @@ int main(
        according to localeconv(3) */       
     setlocale(LC_ALL, "");
 
-#ifdef WIN32 && !defined(__CYGWIN__)
+#if defined(WIN32) && !defined(__CYGWIN__)
     setmode(fileno(stdout), O_BINARY);
     setmode(fileno(stdin), O_BINARY);
 #endif

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index ae519a383e578364befd0a6a6e512b660adb076e..e3dbde780292eed25405c9870c1924957ce9bca8 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -44,7 +44,7 @@ extern    "C" {
 #else
 
 /* unix-only includes */
-#if !defined isnan && !defined HAVE_ISNAN
+#if !defined(isnan) && !defined(HAVE_ISNAN)
     int       isnan(
     double value);
 #endif