# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 741864696 0
# Node ID d968bcba16af10c02e0c986e3bd67a2629d2dc44
# Parent  b9bdcf862c67bb0ebb3391cce4219e69bf1ccba9
	* 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.

diff -r b9bdcf862c67 -r d968bcba16af src/xfaces.c
--- a/src/xfaces.c	Mon Jul 05 08:13:50 1993 +0000
+++ b/src/xfaces.c	Mon Jul 05 09:31:36 1993 +0000
@@ -34,22 +34,24 @@
 #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>
-#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
+#include <time.h>
+#undef USG
+#include <X11/Xos.h>
+#define USG
+#define __TIMEVAL__
+
+#else
 
 #include <X11/Xos.h>
 
+#endif
+
 
 /* An explanation of the face data structures.  */