diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-02-24 20:33:19 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-02-24 20:33:19 +0000 |
| commit | bc465f37fc7208e8369b1abe430d19e83286aad0 (patch) | |
| tree | a1d6a42ee6692a9f59ee6c3606eea8ed3c0fa396 /text2pcap.c | |
| parent | d0e99235067634385db7cdffa3807c15efc0de21 (diff) | |
Revisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
and r39501:
Setting _XOPEN_SOURCE to 600 is only allowed on Solaris 10 if the compiler is
set to C99 mode. Conversely (and as reported in the bug), simply defining it
(but with no value) is not allowed if the compiler *is* compiling to C99.
So, don't define _XOPEN_SOURCE at all on Solaris. Keep defining it as 600 on
other OS's as (also) requested in that bug.
Maybe there's a cleaner way to do this but all of this is a "trickery" mess
anyway...
svn path=/trunk/; revision=41182
Diffstat (limited to 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/text2pcap.c b/text2pcap.c index a9033d6d40..ed31688dd8 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -90,7 +90,9 @@ # define __USE_XOPEN #endif #ifndef _XOPEN_SOURCE -# define _XOPEN_SOURCE 600 +# ifndef __solaris__ +# define _XOPEN_SOURCE 600 +# endif #endif /* |