Commit c70c2705 authored by David J. MacKenzie's avatar David J. MacKenzie
Browse files

Don't assume that HAVE_CONFIG_H implies emacs.

parent bccfd936
...@@ -17,8 +17,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -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. */ /* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#ifdef emacs
/* Get the O_* definitions for open et al. */ /* Get the O_* definitions for open et al. */
#include <sys/file.h> #include <sys/file.h>
...@@ -26,7 +28,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -26,7 +28,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#else /* not HAVE_CONFIG_H */ #else /* not emacs */
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
#include <stdlib.h> #include <stdlib.h>
...@@ -49,7 +51,7 @@ char *realloc (); ...@@ -49,7 +51,7 @@ char *realloc ();
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#endif /* not HAVE_CONFIG_H */ #endif /* not emacs */
#ifndef NULL #ifndef NULL
#define NULL (char *) 0 #define NULL (char *) 0
......
...@@ -18,8 +18,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -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. */ /* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#else /* not HAVE_CONFIG_H */ #endif
#ifndef emacs
#if defined(HAVE_STRING_H) || defined(STDC_HEADERS) #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
#define bcopy(s, d, n) memcpy ((d), (s), (n)) #define bcopy(s, d, n) memcpy ((d), (s), (n))
#endif #endif
...@@ -32,7 +33,7 @@ char *malloc (); ...@@ -32,7 +33,7 @@ char *malloc ();
char *realloc (); char *realloc ();
#endif #endif
#endif /* not HAVE_CONFIG_H */ #endif /* not emacs */
#ifndef NULL #ifndef NULL
#define NULL (char *) 0 #define NULL (char *) 0
......
...@@ -18,8 +18,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -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. */ /* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#else /* not HAVE_CONFIG_H */ #endif
#ifndef emacs
#if defined(HAVE_STRING_H) || defined(STDC_HEADERS) #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
#define bcopy(s, d, n) memcpy ((d), (s), (n)) #define bcopy(s, d, n) memcpy ((d), (s), (n))
#endif #endif
...@@ -32,7 +33,7 @@ char *malloc (); ...@@ -32,7 +33,7 @@ char *malloc ();
char *realloc (); char *realloc ();
#endif #endif
#endif /* not HAVE_CONFIG_H */ #endif /* not emacs */
#ifndef NULL #ifndef NULL
#define NULL (char *) 0 #define NULL (char *) 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment