From 657070acda0f1897d0f4768ec621b8831ca9840a Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@redhat.com>
Date: Mon, 5 Jul 1993 09:31:36 +0000
Subject: [PATCH] * xfaces.c [XOS_NEEDS_TIME_H]: #undef USG while #including 
 <X11/Xos.h>, so that file doesn't try to define struct timeval and 	struct
 timezone.

---
 src/xfaces.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/xfaces.c b/src/xfaces.c
index de7b66036de..e5097b5ef8b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -34,22 +34,24 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "blockinput.h"
 #include "window.h"
 
-/* Compensate for bug in Xos.h on some systems.  */
+/* Compensate for bug in Xos.h on some systems, on which it requires
+   time.h.  On some such systems, Xos.h tries to redefine struct
+   timeval and struct timezone if USG is #defined while it is
+   #included.  */
 #ifdef XOS_NEEDS_TIME_H
+
 #include <time.h>
+#undef USG
+#include <X11/Xos.h>
+#define USG
 #define __TIMEVAL__
-#endif
 
-/* These don't seem to be used.  */
-#if 0
-/* Display Context for the icons */ 
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-#include <X11/Xmu/Drawing.h>
-#endif
+#else
 
 #include <X11/Xos.h>
 
+#endif
+
 
 /* An explanation of the face data structures.  */
 
-- 
2.39.5