Include <config.h> uniformly in oldXMenu sources.

* Activate.c, AddPane.c, AddSel.c, ChgPane.c, ChgSel.c, Create.c:
* InsPane.c, InsSel.c, Internal.c, XMakeAssoc.c:
Do not include <config.h>, since XMenuInt.h does that now.
* XLookAssoc.c, XMenuInt.h: Include <config.h>.
This avoids a build failure when configuring on Fedora 17
--with-x-toolkit=no, reported by Dmitry Andropov in
<http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00078.html>.

13 files changed, 17 insertions, 18 deletions

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index d4683da87f2..51ffc47f0c9 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -95,7 +95,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <X11/keysym.h>
 
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 36b57fe8da6..2c8dda8cd11 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -12,7 +12,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 2b1ff3d6c89..07eb1fed15b 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 133b18b4e3f..3601b980ab0 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,14 @@
+2012-12-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Include <config.h> uniformly in oldXMenu sources.
+        * Activate.c, AddPane.c, AddSel.c, ChgPane.c, ChgSel.c, Create.c:
+        * InsPane.c, InsSel.c, Internal.c, XMakeAssoc.c:
+        Do not include <config.h>, since XMenuInt.h does that now.
+        * XLookAssoc.c, XMenuInt.h: Include <config.h>.
+        This avoids a build failure when configuring on Fedora 17
+        --with-x-toolkit=no, reported by Dmitry Andropov in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00078.html>.
+
 2012-10-06  Ulrich Müller  <ulm@gentoo.org>
 
         * Makefile.in (AR, ARFLAGS): Get values from configure.
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 38b63820161..d2977b73faf 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
@@ -65,4 +64,3 @@ XMenuChangePane(register XMenu *menu, register int p_num, char *label)
     _XMErrorCode = XME_NO_ERROR;
     return(p_num);
 }
-
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index dcefb6c3a5d..d24e61f56d5 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
@@ -87,4 +86,3 @@ XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num,
     _XMErrorCode = XME_NO_ERROR;
     return(s_num);
 }
-
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 1d21e534300..6dda7d44ef4 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <stdlib.h>
 
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index bdbadbf1226..d8470f3a5bf 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -14,7 +14,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index 5db285f6408..66f4968197d 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index dc8dc0120ef..ee1e88b396e 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 /*
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index e287ebbaa72..fad960d7a4c 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -2,7 +2,7 @@
 
 #include "copyright.h"
 
-
+#include <config.h>
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 #include "X10.h"
@@ -18,10 +18,9 @@
  * in the table the routine will return a NULL pointer.  All XId's are relative
  * to the currently active Display.
  */
-caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
-                              
-                                        /* XAssocTable to search in. */
-                                                /* XId to search for. */
+caddr_t XLookUpAssoc(Display *dpy,
+                     XAssocTable *table,  /* XAssocTable to search in. */
+                     XID x_id)            /* XId to search for. */
 {
         int hash;
         register XAssoc *bucket;
@@ -55,4 +54,3 @@ caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, registe
         /* It is apparently not in the table. */
         return(NULL);
 }
-
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index 143b2641112..9bbde2cf94d 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -3,7 +3,6 @@
 #include "copyright.h"
 
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <X11/Xresource.h>
 #include <errno.h>
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 721652c9539..1edef30bc5f 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -17,6 +17,8 @@
 #ifndef _XMenuInternal_h_
 #define _XMenuInternal_h_
 
+#include <config.h>
+
 /* Avoid warnings about redefining NULL by including <stdio.h> first;
    the other file which wants to define it (<stddef.h> on Ultrix
    systems) can deal if NULL is already defined, but <stdio.h> can't.  */