(NARROWPROTO): New.

8 files changed, 33 insertions, 2 deletions

diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index d4ae16cd814..af994acd428 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -92,7 +92,9 @@
 
 #define HAVE_WAIT_HEADER
 #define HAVE_GETLOADAVG
-/*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
+#if 0
+#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
+#endif
 #define HAVE_TERMIOS
 #define NO_TERMIO
 #define DECLARE_GETPWUID_WITH_UID_T
@@ -132,3 +134,11 @@
    remaining in /tmp or other directories with +t bit.
    To avoid this problem, you could #undef it to use no file lock. */
 /* #undef CLASH_DETECTION */
+
+/* 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
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 82445048eba..2b9a80cf1a8 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -303,6 +303,8 @@ Boston, MA 02111-1307, USA.  */
 #define BSD_PGRPS
 #define setpgrp(pid,pgid) setpgid(pid,pgid)
 
+#define NARROWPROTO 1
+
 /* Use mmap directly for allocating larger buffers.  */
 #ifdef DOUG_LEA_MALLOC
 #undef REL_ALLOC
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 888b0a5c929..6a38dc6f588 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -76,3 +76,5 @@ Boston, MA 02111-1307, USA.  */
 #ifndef NOT_C_CODE
 #include <fcntl.h>
 #endif
+
+#define NARROWPROTO 1
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
index 477f85756d4..b898460215b 100644
--- a/src/s/irix5-0.h
+++ b/src/s/irix5-0.h
@@ -127,3 +127,6 @@ char *_getpty();
 /* Prevent the variable ospeed from being defined by -lcurses
    because it defines it with too few bytes.  */
 #define ospeed ospeed_
+
+#define NARROWPROTO 1
+
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 891e610da61..19938051f68 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -79,3 +79,5 @@
    this problem, and will also work on earlier NetBSD releases */
 
 #define LINKER $(CC) -nostartfiles
+
+#define NARROWPROTO 1
diff --git a/src/s/sco4.h b/src/s/sco4.h
index a450b41cb61..246348cf75b 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -148,3 +148,5 @@ Boston, MA 02111-1307, USA.  */
    It doesn't have the kind of sockets that emacsclient.c
    and emacsserver.c would use.  */
 #define NO_SOCKETS_IN_FILE_SYSTEM
+
+#define NARROWPROTO 1
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 00716962782..436abe00cdb 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -169,3 +169,5 @@ Boston, MA 02111-1307, USA.  */
 #define START_FILES pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/values-Xt.o
 #undef LIB_STANDARD
 #define LIB_STANDARD -lc /usr/ccs/lib/crtn.o
+
+#define NARROWPROTO 1
diff --git a/src/s/template.h b/src/s/template.h
index ee6da5cc57a..7f49ca3047e 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -1,7 +1,7 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -163,6 +163,14 @@ Boston, MA 02111-1307, USA.  */
 
 /* #define static */
 
+/* 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