Don't assume that HAVE_CONFIG_H implies emacs.
This commit is contained in:
parent
bccfd93664
commit
c70c27055d
3 changed files with 11 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
5
tparam.c
5
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
|
||||
|
|
Loading…
Add table
Reference in a new issue