fix for sun sudio 11 incompatibility http://www.netbsd.org/cgi-bin/query-pr-single...

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 b389aaa53391281f49daba5df73c0918ac358bc9..50a61e882ea76d13104285a6b30d9af92adff995 100644 (file)
--- 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 4c406e9f9c711ff8dbbca746dd450cf4a95bebf1..075bc8da48b79643af6794ddfc5c51270693982a 100644 (file)
--- 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.  */
 \f
-#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