From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 10 Mar 2011 01:40:21 +0000 (-0800)
Subject: * xrdb.c: Include "xterm.h", to check x_load_resources's interface.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b47160217819ef2408f1115d7f812c16d06dcbcb;p=emacs.git

* xrdb.c: Include "xterm.h", to check x_load_resources's interface.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 40c502a7970..e3eb8fe02a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-10  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* xrdb.c: Include "xterm.h", to check x_load_resources's interface.
+
 	* xselect.c (x_disown_buffer_selections): Remove; not used.
 	(TRACE3) [!defined TRACE_SELECTION]: Remove; not used.
 	(x_own_selection, Fx_disown_selection_internal): Rename locals
diff --git a/src/xrdb.c b/src/xrdb.c
index 9fb3f3474fb..63e5851979c 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -28,6 +28,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <setjmp.h>
 
+#include "lisp.h"
+
+/* This may include sys/types.h, and that somehow loses
+   if this is not done before the other system files.  */
+#include "xterm.h"
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/X.h>
@@ -38,8 +44,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #include <sys/stat.h>
 
-#include "lisp.h"
-
 #ifdef USE_MOTIF
 /* For Vdouble_click_time.  */
 #include "keyboard.h"