Move getopt() portability fiddles out of system.h

- only macro.c needs, no point polluting includes everywhere

diff --git a/rpmio/macro.c b/rpmio/macro.c
index 11e23a3..f12091f 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -4,6 +4,12 @@
 
 #include "system.h"
 #include <stdarg.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
+#endif
 
 #if !defined(isblank)
 #define        isblank(_c)     ((_c) == ' ' || (_c) == '\t')

diff --git a/system.h b/system.h
index a02ae24..bdcb3a7 100644 (file)
--- a/system.h
+++ b/system.h
@@ -155,10 +155,6 @@ char *realpath(const char *path, char resolved_path []);
 #include <sys/wait.h>
 #endif
 
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif