diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-08-09 21:02:10 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-08-09 21:02:10 +0000 |
| commit | bf95c7b5e4f2d0a498fd9cee41f77262e1ddda89 (patch) | |
| tree | acde70beaac706649ef2f54d96cfddf3a7df317b /mergecap.c | |
| parent | a60d91018f56f0beb6bfe7d797a0fea20be2339f (diff) | |
| download | wireshark-bf95c7b5e4f2d0a498fd9cee41f77262e1ddda89.tar.gz | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
getopt() can/should normally be found in unistd.h, so:
- When testing for getopt(), define that we HAVE_GETOPT instead of
HAVE_GETOPT_H (to avoid confusion).
- Don't attempt to include getopt.h: not all OS's have it (for example,
Solaris 9 does not).
- (All the places which need getopt already include unistd.h (if we have it).)
If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check.
svn path=/trunk/; revision=38437
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 1 insertions, 3 deletions
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 |