From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Sun, 4 May 2008 18:59:20 +0000 (+0000)
Subject: fix for sun sudio 11 incompatibility http://www.netbsd.org/cgi-bin/query-pr-single... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=726357ba0ac5bd2f6c1a29d8364da9b718434fd2;p=rrdtool-all.git

fix for sun sudio 11 incompatibility netbsd.org/cgi-bin/query-pr-single.pl?number=38555


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1338 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/program/src/rrd_getopt.c b/program/src/rrd_getopt.c
index b389aaa5..50a61e88 100644
--- a/program/src/rrd_getopt.c
+++ b/program/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 <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/program/src/rrd_getopt1.c b/program/src/rrd_getopt1.c
index 4c406e9f..075bc8da 100644
--- a/program/src/rrd_getopt1.c
+++ b/program/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 <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not