Don't assume that HAVE_CONFIG_H implies emacs.

diff --git a/src/termcap.c b/src/termcap.c
index 2a270c454eb66da96633feac6083a0c5f87bde1e..595fc425c181893ab9460f2cf0700e9da6c7c5a1 100644 (file)
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -17,8 +17,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
-
 #include <config.h>
+#endif
+
+#ifdef emacs
 
 /* Get the O_* definitions for open et al.  */
 #include <sys/file.h>
@@ -26,7 +28,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <fcntl.h>
 #endif
 
-#else /* not HAVE_CONFIG_H */
+#else /* not emacs */
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>
@@ -49,7 +51,7 @@ char *realloc ();
 #include <fcntl.h>
 #endif
 
-#endif /* not HAVE_CONFIG_H */
+#endif /* not emacs */
 
 #ifndef NULL
 #define NULL (char *) 0

diff --git a/src/tparam.c b/src/tparam.c
index 24702899a8346881845868ee29fd9edff8f8e936..a5ee362eaa4f5fcdefde568a7bb05474ceb0d04b 100644 (file)
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -18,8 +18,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#else /* not HAVE_CONFIG_H */
+#endif
 
+#ifndef emacs
 #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
 #define bcopy(s, d, n) memcpy ((d), (s), (n))
 #endif
@@ -32,7 +33,7 @@ char *malloc ();
 char *realloc ();
 #endif
 
-#endif /* not HAVE_CONFIG_H */
+#endif /* not emacs */
 
 #ifndef NULL
 #define NULL (char *) 0

diff --git a/tparam.c b/tparam.c
index 24702899a8346881845868ee29fd9edff8f8e936..a5ee362eaa4f5fcdefde568a7bb05474ceb0d04b 100644 (file)
--- a/tparam.c
+++ b/tparam.c
@@ -18,8 +18,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#else /* not HAVE_CONFIG_H */
+#endif
 
+#ifndef emacs
 #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
 #define bcopy(s, d, n) memcpy ((d), (s), (n))
 #endif
@@ -32,7 +33,7 @@ char *malloc ();
 char *realloc ();
 #endif
 
-#endif /* not HAVE_CONFIG_H */
+#endif /* not emacs */
 
 #ifndef NULL
 #define NULL (char *) 0