summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1993-10-04 21:07:58 +0000
committerJim Meyering <jim@meyering.net>1993-10-04 21:07:58 +0000
commit0b7fe2dc03f9a8e5330f4c96f5d6279f61f3fb1d (patch)
treef14e1eff26088d6d2dd1483690bb772ca88e0f25
parent23d0b20bb08f183dba5673019b5a1f5ed25dde78 (diff)
downloadgnulib-0b7fe2dc03f9a8e5330f4c96f5d6279f61f3fb1d.tar.gz
GNU shell utilitiesSHELLUTILS-1_8_1a
-rw-r--r--lib/alloca.c4
-rw-r--r--lib/getopt.c6
-rw-r--r--lib/getopt1.c6
-rw-r--r--lib/xmalloc.c3
4 files changed, 16 insertions, 3 deletions
diff --git a/lib/alloca.c b/lib/alloca.c
index cab9645b7e..bd4932aa44 100644
--- a/lib/alloca.c
+++ b/lib/alloca.c
@@ -22,8 +22,12 @@
your main control loop, etc. to force garbage collection. */
#ifdef HAVE_CONFIG_H
+#if defined (emacs) || defined (CONFIG_BROKETS)
+#include <config.h>
+#else
#include "config.h"
#endif
+#endif
/* If compiling with GCC 2, this file's not needed. */
#if !defined (__GNUC__) || __GNUC__ < 2
diff --git a/lib/getopt.c b/lib/getopt.c
index 49db998568..7a4673b8d8 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -21,10 +21,14 @@
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
+#if defined (emacs) || defined (CONFIG_BROKETS)
/* We use <config.h> instead of "config.h" so that a compilation
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
- (which it would do because getopt.c was found in $srcdir). */
+ (which it would do because it found this file in $srcdir). */
#include <config.h>
+#else
+#include "config.h"
+#endif
#endif
#ifndef __STDC__
diff --git a/lib/getopt1.c b/lib/getopt1.c
index 2b93f78352..f784b5757c 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -17,10 +17,14 @@
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
+#if defined (emacs) || defined (CONFIG_BROKETS)
/* We use <config.h> instead of "config.h" so that a compilation
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
- (which it would do because getopt1.c was found in $srcdir). */
+ (which it would do because it found this file in $srcdir). */
#include <config.h>
+#else
+#include "config.h"
+#endif
#endif
#include "getopt.h"
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index d58db5ed55..bce4325135 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -25,10 +25,11 @@
#define VOID char
#endif
+#include <sys/types.h>
+
#if STDC_HEADERS
#include <stdlib.h>
#else
-#include <sys/types.h>
VOID *malloc ();
VOID *realloc ();
void free ();