[Emacs-diffs] /srv/bzr/emacs/trunk r111093: Include <config.h> uniformly in oldXMenu sources.

[Paul Eggert]

------------------------------------------------------------
revno: 111093
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-04 12:42:29 -0800
message:
  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>.
modified:
  oldXMenu/Activate.c
  oldXMenu/AddPane.c
  oldXMenu/AddSel.c
  oldXMenu/ChangeLog
  oldXMenu/ChgPane.c
  oldXMenu/ChgSel.c
  oldXMenu/Create.c
  oldXMenu/InsPane.c
  oldXMenu/InsSel.c
  oldXMenu/Internal.c
  oldXMenu/XLookAssoc.c
  oldXMenu/XMakeAssoc.c
  oldXMenu/XMenuInt.h

=== modified file 'oldXMenu/Activate.c'
--- a/oldXMenu/Activate.c       2012-01-19 07:21:25 +0000
+++ b/oldXMenu/Activate.c       2012-12-04 20:42:29 +0000
@@ -95,7 +95,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <X11/keysym.h>
 

=== modified file 'oldXMenu/AddPane.c'
--- a/oldXMenu/AddPane.c        2011-04-16 08:25:42 +0000
+++ b/oldXMenu/AddPane.c        2012-12-04 20:42:29 +0000
@@ -12,7 +12,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int

=== modified file 'oldXMenu/AddSel.c'
--- a/oldXMenu/AddSel.c 2011-11-19 09:18:31 +0000
+++ b/oldXMenu/AddSel.c 2012-12-04 20:42:29 +0000
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2012-10-06 00:42:28 +0000
+++ b/oldXMenu/ChangeLog        2012-12-04 20:42:29 +0000
@@ -1,3 +1,14 @@
+2012-12-04  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * Makefile.in (AR, ARFLAGS): Get values from configure.

=== modified file 'oldXMenu/ChgPane.c'
--- a/oldXMenu/ChgPane.c        2011-01-15 23:16:57 +0000
+++ b/oldXMenu/ChgPane.c        2012-12-04 20:42:29 +0000
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
@@ -65,4 +64,3 @@
     _XMErrorCode = XME_NO_ERROR;
     return(p_num);
 }
-

=== modified file 'oldXMenu/ChgSel.c'
--- a/oldXMenu/ChgSel.c 2011-01-15 23:16:57 +0000
+++ b/oldXMenu/ChgSel.c 2012-12-04 20:42:29 +0000
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int
@@ -87,4 +86,3 @@
     _XMErrorCode = XME_NO_ERROR;
     return(s_num);
 }
-

=== modified file 'oldXMenu/Create.c'
--- a/oldXMenu/Create.c 2012-01-19 07:21:25 +0000
+++ b/oldXMenu/Create.c 2012-12-04 20:42:29 +0000
@@ -29,7 +29,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <stdlib.h>
 

=== modified file 'oldXMenu/InsPane.c'
--- a/oldXMenu/InsPane.c        2011-04-16 08:25:42 +0000
+++ b/oldXMenu/InsPane.c        2012-12-04 20:42:29 +0000
@@ -14,7 +14,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int

=== modified file 'oldXMenu/InsSel.c'
--- a/oldXMenu/InsSel.c 2011-04-16 08:25:42 +0000
+++ b/oldXMenu/InsSel.c 2012-12-04 20:42:29 +0000
@@ -13,7 +13,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 int

=== modified file 'oldXMenu/Internal.c'
--- a/oldXMenu/Internal.c       2012-01-19 07:21:25 +0000
+++ b/oldXMenu/Internal.c       2012-12-04 20:42:29 +0000
@@ -29,7 +29,6 @@
  *
  */
 
-#include <config.h>
 #include "XMenuInt.h"
 
 /*

=== modified file 'oldXMenu/XLookAssoc.c'
--- a/oldXMenu/XLookAssoc.c     2011-01-15 23:16:57 +0000
+++ b/oldXMenu/XLookAssoc.c     2012-12-04 20:42:29 +0000
@@ -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 @@
        /* It is apparently not in the table. */
        return(NULL);
 }
-

=== modified file 'oldXMenu/XMakeAssoc.c'
--- a/oldXMenu/XMakeAssoc.c     2011-04-16 08:25:42 +0000
+++ b/oldXMenu/XMakeAssoc.c     2012-12-04 20:42:29 +0000
@@ -3,7 +3,6 @@
 #include "copyright.h"
 
 
-#include <config.h>
 #include "XMenuInt.h"
 #include <X11/Xresource.h>
 #include <errno.h>

=== modified file 'oldXMenu/XMenuInt.h'
--- a/oldXMenu/XMenuInt.h       2011-04-16 08:25:42 +0000
+++ b/oldXMenu/XMenuInt.h       2012-12-04 20:42:29 +0000
@@ -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.  */