From 72d1c36855e2f0d8638a21290e9eb0fb0bb05f2b Mon Sep 17 00:00:00 2001 From: oetiker Date: Sun, 4 May 2008 18:59:20 +0000 Subject: [PATCH] fix for sun sudio 11 incompatibility http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=38555 git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1338 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd_getopt.c | 14 ++++++++------ src/rrd_getopt1.c | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c index b389aaa..50a61e8 100644 --- a/src/rrd_getopt.c +++ b/src/rrd_getopt.c @@ -30,12 +30,6 @@ #define _NO_PROTO #endif -#ifdef HAVE_CONFIG_H -#include "../rrd_config.h" -#endif - -#include "rrd_i18n.h" - #if !defined (__STDC__) || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ @@ -44,6 +38,14 @@ #endif #endif + +#ifdef HAVE_CONFIG_H +#include "../rrd_config.h" +#endif + +#include "rrd_i18n.h" + + #include /* Comment out all this code if we are using the GNU C Library, and are not diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c index 4c406e9..075bc8d 100644 --- a/src/rrd_getopt1.c +++ b/src/rrd_getopt1.c @@ -19,11 +19,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include "../rrd_config.h" -#endif - -#include "rrd_getopt.h" #if !defined (__STDC__) || !__STDC__ /* This is a separate conditional since some stdc systems @@ -33,6 +28,12 @@ #endif #endif +#ifdef HAVE_CONFIG_H +#include "../rrd_config.h" +#endif + +#include "rrd_getopt.h" + #include /* Comment out all this code if we are using the GNU C Library, and are not -- 2.30.2