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 4845a1693be2a1bafe2fcd7cb23486d450b3200f..f09a90c7d5fef4a99c82ed9f42720b9eb56af75f 100644 (file)
--- 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 a2179c6f503513e892b4821ba0d39ad44124077e..b715ab0339d701efce02af16e45b1392e6765aaa 100644 (file)
--- 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 d26b58451edfe19bab82ee45406668936a8f707d..14e1e885685699156ed730d82b6c963ce75ee39a 100644 (file)
--- 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 cf4f45c5ba9b28646d3544181e07dd4664f1b7ed..954dac8989cafef26b4c7ec58dbfd18cb478e6f2 100644 (file)
--- 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