# HG changeset patch
# User David J. MacKenzie <djm@gnu.org>
# Date 810085661 0
# Node ID bd38619285f7f5ea7ebb413d340bd4234ec52522
# Parent  13b9311103c834d0bf4b143875974fce317ea554
Don't assume that HAVE_CONFIG_H implies emacs.

diff -r 13b9311103c8 -r bd38619285f7 src/termcap.c
--- a/src/termcap.c	Sat Sep 02 16:36:41 1995 +0000
+++ b/src/termcap.c	Sat Sep 02 23:47:41 1995 +0000
@@ -17,8 +17,10 @@
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <config.h>
+#ifdef emacs
 
 /* Get the O_* definitions for open et al.  */
 #include <sys/file.h>
@@ -26,7 +28,7 @@
 #include <fcntl.h>
 #endif
 
-#else /* not HAVE_CONFIG_H */
+#else /* not emacs */
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>
@@ -49,7 +51,7 @@
 #include <fcntl.h>
 #endif
 
-#endif /* not HAVE_CONFIG_H */
+#endif /* not emacs */
 
 #ifndef NULL
 #define NULL (char *) 0
diff -r 13b9311103c8 -r bd38619285f7 src/tparam.c
--- a/src/tparam.c	Sat Sep 02 16:36:41 1995 +0000
+++ b/src/tparam.c	Sat Sep 02 23:47:41 1995 +0000
@@ -18,8 +18,9 @@
 /* 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 *realloc ();
 #endif
 
-#endif /* not HAVE_CONFIG_H */
+#endif /* not emacs */
 
 #ifndef NULL
 #define NULL (char *) 0
diff -r 13b9311103c8 -r bd38619285f7 tparam.c
--- a/tparam.c	Sat Sep 02 16:36:41 1995 +0000
+++ b/tparam.c	Sat Sep 02 23:47:41 1995 +0000
@@ -18,8 +18,9 @@
 /* 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 *realloc ();
 #endif
 
-#endif /* not HAVE_CONFIG_H */
+#endif /* not emacs */
 
 #ifndef NULL
 #define NULL (char *) 0