From: oetiker Date: Fri, 16 Dec 2011 07:30:02 +0000 (+0000) Subject: make cpp defines more portable X-Git-Url: https://git.tokkee.org/?p=rrdtool.git;a=commitdiff_plain;h=5446d200c198659fef439f75134bb37f62f1a236 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 d0340c8..71072b0 100644 --- 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 ae519a3..e3dbde7 100644 --- 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