From 7b4403d361e282183b0794d6037c2847ac1944ad Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 30 Jan 2002 10:19:44 +0000
Subject: [PATCH] Try defining just _USE_XOPEN and see if that gets
 "strptime()" declared on most platforms; it works on Solaris, at least.

svn path=/trunk/; revision=4630
---
 epan/ftypes/ftype-time.c | 17 +----------------
 text2pcap.c              | 17 +----------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 25c7f3d7b3..d34fd095e3 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ftype-time.c,v 1.14 2002/01/30 10:10:03 guy Exp $
+ * $Id: ftype-time.c,v 1.15 2002/01/30 10:19:44 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -31,23 +31,8 @@
  * Just make sure we include the prototype for strptime as well
  * (needed for glibc 2.2)
  */
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 500
-#endif
 #define __USE_XOPEN
 
-/*
- * Defining _XOPEN_SOURCE is needed on some platforms, e.g. platforms
- * using glibc, to expand the set of things system header files define.
- *
- * Unfortunately, on other platforms, such as some versions of Solaris,
- * it *reduces* that set as well, e.g. causing "struct timeval" not
- * to be defined.
- *
- * So we define __EXTENSIONS__ so that "struct timeval" is defined.
- */
-#define __EXTENSIONS__
-
 #include <time.h>
 
 #include <ftypes-int.h>
diff --git a/text2pcap.c b/text2pcap.c
index f3e037c3b4..92f7fcf540 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -6,7 +6,7 @@
  *
  * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id: text2pcap.c,v 1.13 2002/01/30 10:10:01 guy Exp $
+ * $Id: text2pcap.c,v 1.14 2002/01/30 10:19:43 guy Exp $
  * 
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -90,23 +90,8 @@
  * Just make sure we include the prototype for strptime as well
  * (needed for glibc 2.2)
  */
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 500
-#endif
 #define __USE_XOPEN
 
-/*
- * Defining _XOPEN_SOURCE is needed on some platforms, e.g. platforms
- * using glibc, to expand the set of things system header files define.
- *
- * Unfortunately, on other platforms, such as some versions of Solaris,
- * it *reduces* that set as well, e.g. causing "struct timeval" not
- * to be defined.
- *
- * So we define __EXTENSIONS__ so that "struct timeval" is defined.
- */
-#define __EXTENSIONS__
-
 #include <time.h>
 
 #include <sys/types.h>