[Emacs-diffs] /srv/bzr/emacs/trunk r109039: Move NARROWPROTO from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109039
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 20:49:24 -0400
message:
  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.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/bsd-common.h
  src/s/cygwin.h
  src/s/gnu-linux.h
  src/s/irix6-5.h
  src/s/template.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-11 23:40:59 +0000
+++ b/ChangeLog 2012-07-12 00:49:24 +0000
@@ -1,3 +1,7 @@
+2012-07-12  Glenn Morris  <address@hidden>
+
+       * configure.ac (NARROWPROTO): Move here from src/s.
+
 2012-07-11  Glenn Morris  <address@hidden>
 
        * configure.ac (INTERRUPT_INPUT): Move here from src/s.

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-11 23:40:59 +0000
+++ b/configure.ac      2012-07-12 00:49:24 +0000
@@ -3212,6 +3212,19 @@
 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.])
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-11 23:44:03 +0000
+++ b/src/ChangeLog     2012-07-12 00:49:24 +0000
@@ -1,3 +1,8 @@
+2012-07-12  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * s/gnu-linux.h, s/sol2-6.h: No longer define POSIX,

=== modified file 'src/s/bsd-common.h'
--- a/src/s/bsd-common.h        2012-07-11 23:40:59 +0000
+++ b/src/s/bsd-common.h        2012-07-12 00:49:24 +0000
@@ -40,12 +40,5 @@
 #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'

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2012-07-11 23:40:59 +0000
+++ b/src/s/cygwin.h    2012-07-12 00:49:24 +0000
@@ -34,13 +34,6 @@
     }                                                  \
   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
 

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-11 23:44:03 +0000
+++ b/src/s/gnu-linux.h 2012-07-12 00:49:24 +0000
@@ -79,8 +79,6 @@
 #define HAVE_XRMSETDATABASE
 #endif
 
-#define NARROWPROTO 1
-
 #ifdef __ia64__
 #define GC_MARK_SECONDARY_STACK()                              \
   do {                                                         \

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-07-11 07:28:27 +0000
+++ b/src/s/irix6-5.h   2012-07-12 00:49:24 +0000
@@ -70,8 +70,6 @@
 /* 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 */

=== modified file 'src/s/template.h'
--- a/src/s/template.h  2012-07-11 23:40:59 +0000
+++ b/src/s/template.h  2012-07-12 00:49:24 +0000
@@ -52,14 +52,6 @@
    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