From: Tobias Oetiker <tobi@oetiker.ch>
Date: Wed, 14 Feb 2007 18:48:21 +0000 (+0000)
Subject: renamed getopt to rrd_getopt to avoid confusion on some systems ...
X-Git-Tag: 1.2.20~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e0ddc25f2f73784afd8d6c350c72f0be903be35;p=thirdparty%2Frrdtool-1.x.git

renamed getopt to rrd_getopt to avoid confusion on some systems ...


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1007 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 4845a169..f09a90c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,8 @@ RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
 AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
 
 UPD_C_FILES =		\
-	getopt.c	\
-	getopt1.c	\
+	rrd_getopt.c	\
+	rrd_getopt1.c	\
 	parsetime.c	\
 	rrd_hw.c	\
 	rrd_diff.c	\
@@ -51,7 +51,7 @@ noinst_HEADERS = \
         art_rgba_svp.h \
 	unused.h \
 	rrd_gfx.h \
-	getopt.h parsetime.h \
+	rrd_getopt.h parsetime.h \
 	rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h \
 	rrd_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.h \
 	rrd_is_thread_safe.h
diff --git a/src/getopt.c b/src/rrd_getopt.c
similarity index 99%
rename from src/getopt.c
rename to src/rrd_getopt.c
index a2179c6f..b715ab03 100644
--- a/src/getopt.c
+++ b/src/rrd_getopt.c
@@ -110,7 +110,7 @@
    GNU application programs can use a third alternative mode in which
    they can distinguish the relative order of options and other arguments.  */
 
-#include "getopt.h"
+#include "rrd_getopt.h"
 
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
diff --git a/src/getopt.h b/src/rrd_getopt.h
similarity index 100%
rename from src/getopt.h
rename to src/rrd_getopt.h
diff --git a/src/getopt1.c b/src/rrd_getopt1.c
similarity index 99%
rename from src/getopt1.c
rename to src/rrd_getopt1.c
index d26b5845..14e1e885 100644
--- a/src/getopt1.c
+++ b/src/rrd_getopt1.c
@@ -23,7 +23,7 @@
 #include "../rrd_config.h"
 #endif
 
-#include "getopt.h"
+#include "rrd_getopt.h"
 
 #if !defined (__STDC__) || !__STDC__
 /* This is a separate conditional since some stdc systems
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index cf4f45c5..954dac89 100644
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -115,7 +115,7 @@ int isnan(double value);
 #endif
 
 /* local include files -- need to be after the system ones */
-#include "getopt.h"
+#include "rrd_getopt.h"
 #include "rrd_format.h"
 
 #ifndef max