Rename our getopt.h to getopt_long.h.

That way, if we *do* have getopt_long(), we don't end up including our
getopt.h rather than the system's getopt.h.

diff --git a/Makefile.in b/Makefile.in
index 2b6bd1b265617d9de4717fc705c3ebfbf84f1933..6630d547d001cb03c005b5bad7e1ec7d1c3f4204 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -236,7 +236,7 @@ HDR = \
        ether.h \
        ethertype.h \
        extract.h \
-       getopt.h \
+       getopt_long.h \
        gmpls.h \
        gmt2local.h \
        interface.h \

diff --git a/getopt.h b/getopt_long.h
similarity index 96%
rename from getopt.h
rename to getopt_long.h
index aaaed9008977a93eaaa9debcaffc516f25e4595f..39bac54d4500edbfda8e900e320ebbafcc9a0b82 100644 (file)
--- a/getopt.h
+++ b/getopt_long.h
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
+#ifndef _GETOPT_LONG_H_
+#define _GETOPT_LONG_H_
 
 /*
  * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
@@ -63,4 +63,4 @@ int   getopt_long_only(int, char * const *, const char *,
 extern char *optarg;                   /* getopt(3) external variables */
 extern int optind, opterr, optopt;
  
-#endif /* !_GETOPT_H_ */
+#endif /* !_GETOPT_LONG_H_ */

diff --git a/tcpdump.c b/tcpdump.c
index 6bafec4e20cd589851f3b497363a127cf91bab61..cd022ad8dc99198f14fedf2c66b4ff6daac53739 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -60,7 +60,7 @@ extern int SIZE_BUF;
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else
-#include "getopt.h"
+#include "getopt_long.h"
 #endif
 #include <pcap.h>
 #include <signal.h>