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 /randpkt.c | |
parent | a60d91018f56f0beb6bfe7d797a0fea20be2339f (diff) |
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 'randpkt.c')
-rw-r--r-- | randpkt.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -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 |