Commit 54c908b5 authored by Jim Blandy's avatar Jim Blandy

* xterm.c, xrdb.c: #include <stdio.h> before "xterm.h", to avoid

	warnings about redefining NULL under GCC 2.2.2.
parent e25c4e44
......@@ -29,7 +29,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#endif /* USG5 */
#endif /* 1 */
/* This should be included before the X include files; otherwise, we get
warnings about redefining NULL under BSD 4.3. */
#include <sys/param.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#if 0
......@@ -38,7 +42,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
#include <sys/param.h>
#ifdef VMS
#include "vms-pwd.h"
#else
......
......@@ -31,7 +31,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "lisp.h"
/* On 4.3 this loses if it comes after xterm.h. */
/* On 4.3 these lose if they come after xterm.h. */
#include <stdio.h>
#include <signal.h>
/* This may include sys/types.h, and that somehow loses
......@@ -70,7 +71,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "systime.h"
#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
#include <setjmp.h>
......
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