From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Fri, 16 Dec 2011 07:30:02 +0000 (+0000)
Subject: make cpp defines more portable
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=987cbf34f0d0889cecef3626c3cfe7200012b012;p=rrdtool-all.git

make cpp defines more portable

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

diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index d0340c87..71072b09 100644
--- a/program/src/rrd_tool.c
+++ b/program/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/program/src/rrd_tool.h b/program/src/rrd_tool.h
index ae519a38..e3dbde78 100644
--- a/program/src/rrd_tool.h
+++ b/program/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