diff options
| -rw-r--r-- | capinfos.c | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | dumpcap.c | 4 | ||||
| -rw-r--r-- | editcap.c | 4 | ||||
| -rw-r--r-- | gtk/main.c | 4 | ||||
| -rw-r--r-- | mergecap.c | 4 | ||||
| -rw-r--r-- | randpkt.c | 10 | ||||
| -rw-r--r-- | rawshark.c | 4 | ||||
| -rw-r--r-- | text2pcap.c | 4 | ||||
| -rw-r--r-- | tshark.c | 4 |
10 files changed, 13 insertions, 31 deletions
diff --git a/capinfos.c b/capinfos.c index 36c1dccf09..831f48120e 100644 --- a/capinfos.c +++ b/capinfos.c @@ -88,9 +88,7 @@ #include <wsutil/file_util.h> #endif -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif diff --git a/configure.in b/configure.in index 5ba873fadc..d59ff6f7d2 100644 --- a/configure.in +++ b/configure.in @@ -1742,7 +1742,7 @@ AC_PROG_GCC_TRADITIONAL GETOPT_LO="" AC_CHECK_FUNC(getopt, [GETOPT_LO="" - AC_DEFINE(HAVE_GETOPT_H, 1, [Define to 1 if you have the <getopt.h> header file.]) + AC_DEFINE(HAVE_GETOPT, 1, [Define to 1 if you have the getopt function.]) ], GETOPT_LO="wsgetopt.lo" ) @@ -59,9 +59,7 @@ #include <signal.h> #include <errno.h> -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif @@ -42,9 +42,7 @@ #include "wtap.h" -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif diff --git a/gtk/main.c b/gtk/main.c index a936329e50..5290829d40 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -45,9 +45,7 @@ #include <unistd.h> #endif -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif diff --git a/mergecap.c b/mergecap.c index 70b4b58ff7..99a9cf26f2 100644 --- a/mergecap.c +++ b/mergecap.c @@ -27,9 +27,7 @@ #include <string.h> #include "wtap.h" -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif @@ -27,16 +27,14 @@ #include "config.h" #endif -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else -#include "wsutil/wsgetopt.h" -#endif - #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifndef HAVE_GETOPT +#include "wsutil/wsgetopt.h" +#endif + #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif diff --git a/rawshark.c b/rawshark.c index df30037b89..ce0e232339 100644 --- a/rawshark.c +++ b/rawshark.c @@ -61,9 +61,7 @@ # include <sys/stat.h> #endif -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif diff --git a/text2pcap.c b/text2pcap.c index daf1dacece..c2d5f7f532 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -125,9 +125,7 @@ #include <errno.h> #include <assert.h> -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif @@ -51,9 +51,7 @@ # include <sys/stat.h> #endif -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif |