X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_getopt1.c;h=075bc8da48b79643af6794ddfc5c51270693982a;hb=a9c2a94950e57c9d8847073c579a24455e749a66;hp=6ace7943cd546794225f2d57258879e086c84a73;hpb=2a6a270edfda89b04722b42b57992907f871c671;p=rrdtool.git diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c index 6ace794..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 @@ -114,19 +115,19 @@ int main( { int c; int digit_optind = 0; + struct option long_options[] = { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; while (1) { int this_option_optind = optind ? optind : 1; int option_index = 0; - static struct option long_options[] = { - {"add", 1, 0, 0}, - {"append", 0, 0, 0}, - {"delete", 1, 0, 0}, - {"verbose", 0, 0, 0}, - {"create", 0, 0, 0}, - {"file", 1, 0, 0}, - {0, 0, 0, 0} - }; c = getopt_long(argc, argv, "abc:d:0123456789", long_options, &option_index);