summaryrefslogtreecommitdiff
path: root/text2pcap.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2007-04-22 20:04:34 +0000
committerJörg Mayer <jmayer@loplof.de>2007-04-22 20:04:34 +0000
commitb16106f89f474978b22d8c7e555bc61634d6766f (patch)
tree75fd9c188c709b19a8d4642567741855434e6700 /text2pcap.c
parent065be642f4a970c0a12d80d00df7e1e93cbbd254 (diff)
downloadwireshark-b16106f89f474978b22d8c7e555bc61634d6766f.tar.gz
Only #deinfe __USE_XOPEN if not already defined. On my Suse 10.2 it was
already #defined to 1, so this would create a warning/error. svn path=/trunk/; revision=21508
Diffstat (limited to 'text2pcap.c')
-rw-r--r--text2pcap.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/text2pcap.c b/text2pcap.c
index ea058f2249..a7349b9ce5 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -88,9 +88,12 @@
/*
* Just make sure we include the prototype for strptime as well
- * (needed for glibc 2.2)
+ * (needed for glibc 2.2) but make sure we do this only if not
+ * yet defined.
*/
-#define __USE_XOPEN
+#ifndef
+# define __USE_XOPEN
+#endif
#include <time.h>
#include <glib.h>