Move NARROWPROTO from src/s to configure

* configure.ac (NARROWPROTO): Move here from src/s.

* src/s/bsd-common.h, src/s/cygwin.h, src/s/gnu-linux.h, src/s/irix6-5.h:
* src/s/template.h: Move NARROWPROTO to configure.

diff --git a/ChangeLog b/ChangeLog
index 802c2c0d4e53f5d15f62bd52183111e5e4d06503..2d04859967252cdc2cea767d6170de5d4288937a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-12  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac (NARROWPROTO): Move here from src/s.
+
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
        * configure.ac (INTERRUPT_INPUT): Move here from src/s.

diff --git a/configure.ac b/configure.ac
index 9ec7ebcd08a28e01a57d327cdd1234ee122cdf94..1f053a6e7138ce6180edb9aa3b5cd42933fa9d0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3212,6 +3212,19 @@ case $opsys in
 esac
 
 
+dnl If the system's imake configuration file defines `NeedWidePrototypes'
+dnl as `NO', we must define NARROWPROTO manually.  Such a define is
+dnl generated in the Makefile generated by `xmkmf'.  If we don't define
+dnl NARROWPROTO, we will see the wrong function prototypes for X functions
+dnl taking float or double parameters.
+case $opsys in
+  cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd)
+    AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration
+      file defines `NeedWidePrototypes' as `NO'.])
+  ;;
+esac
+
+
 AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
 "typing" a signal character on the pty.])
 

diff --git a/src/ChangeLog b/src/ChangeLog
index a15fcc0889509d71d2e2be2bdb68a6c311b742e7..494f3c89861c627f9683e2a5da5220a8ce09204e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-12  Glenn Morris  <rgm@gnu.org>
+
+       * s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h:
+       * s/template.h: Move NARROWPROTO to configure.
+
 2012-07-11  Glenn Morris  <rgm@gnu.org>
 
        * s/gnu-linux.h, s/sol2-6.h: No longer define POSIX,

diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index aceb45fc63e22344cf150a7edba0506267b5514d..0fa6d1464798125cdef89f196405e5c09095dfaa 100644 (file)
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -40,12 +40,5 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define TABDLY OXTABS
 #define TAB3 OXTABS
 
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-#define NARROWPROTO 1
-
 /* First pty name is /dev/ptyp0.  */
 #define FIRST_PTY_LETTER 'p'

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 95f0bd79dc94493a826c6f7c5f8a2a7a48b50299..0c9bfe203b15448958e6c276ff8816ab81efda61 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -34,13 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     }                                                  \
   while (0)
 
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-#define NARROWPROTO 1
-
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
 

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index c7567cfcbcbca6ba63aaec797c9cc133d9fcf918..5e8691b55ce358c5892613bf6336d81234a55a2a 100644 (file)
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -79,8 +79,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_XRMSETDATABASE
 #endif
 
-#define NARROWPROTO 1
-
 #ifdef __ia64__
 #define GC_MARK_SECONDARY_STACK()                              \
   do {                                                         \

diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 506f2c6cd8fb6c451e14657e9b1f1cece6e889c4..cd06af7c2bb6c3df6994a5c987d7895712f4c373 100644 (file)
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -70,8 +70,6 @@ char *_getpty();
 /* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
 #define PREFER_VSUSP
 
-#define NARROWPROTO 1
-
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
 
 #undef TIOCSIGSEND             /* defined in usg5-4-common.h */

diff --git a/src/s/template.h b/src/s/template.h
index 832ff9cb43863608b0cbb005e8f5979059b825b7..a343a4b006e8b2c30f3d7b5d403040a968241541 100644 (file)
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -52,14 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    your system and must be used only through an encapsulation (which
    you should place, by convention, in sysdep.c).  */
 
-/* If the system's imake configuration file defines `NeedWidePrototypes'
-   as `NO', we must define NARROWPROTO manually.  Such a define is
-   generated in the Makefile generated by `xmkmf'.  If we don't
-   define NARROWPROTO, we will see the wrong function prototypes
-   for X functions taking float or double parameters.  */
-
-/*  #define NARROWPROTO 1 */
-
 /* ============================================================ */
 
 /* After adding support for a new system, modify the large case