Commit 657070ac authored by Jim Blandy's avatar Jim Blandy
Browse files

* 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.
parent b1e94638
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment