summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/getdate.y4
-rw-r--r--lib/getopt.c7
-rw-r--r--lib/getopt1.c7
-rw-r--r--lib/getusershell.c7
-rw-r--r--lib/putenv.c61
-rw-r--r--lib/strftime.c11
-rw-r--r--lib/strtod.c31
7 files changed, 36 insertions, 92 deletions
diff --git a/lib/getdate.y b/lib/getdate.y
index 851bd9a92..e77cc1f62 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -14,11 +14,7 @@
/* SUPPRESS 288 on yyerrlab *//* Label unused */
#ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
/* Since the code of getdate.y is not included in the Emacs executable
diff --git a/lib/getopt.c b/lib/getopt.c
index 82f6ad916..ac0d6f3f7 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -27,14 +27,7 @@
#endif
#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 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 f784b5757..725c653bb 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -17,14 +17,7 @@
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 it found this file in $srcdir). */
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include "getopt.h"
diff --git a/lib/getusershell.c b/lib/getusershell.c
index 9eb2520b0..d3158d3b9 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -18,14 +18,7 @@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
#ifdef HAVE_CONFIG_H
-#if 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 it found this file in $srcdir). */
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#ifndef SHELLS_FILE
diff --git a/lib/putenv.c b/lib/putenv.c
index 47f7256e5..06e3254b6 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -1,59 +1,49 @@
/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
-#if 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 it found this file in $srcdir). */
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include <sys/types.h>
#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
-/* This needs to come after some library #include
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt.
+ This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
#include <stdlib.h>
#else
char *malloc ();
#endif /* GNU C library. */
-#ifndef STDC_HEADERS
-extern int errno;
-#endif
-
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
#include <string.h>
-#ifndef index
-#define index strchr
-#endif
-#ifndef bcopy
-#define bcopy(s, d, n) memcpy((d), (s), (n))
-#endif
#else
#include <strings.h>
+#ifndef strchr
+#define strchr index
+#endif
+#ifndef memcpy
+#define memcpy(d, s, n) bcopy((s), (d), (n))
+#endif
#endif
#ifdef HAVE_UNISTD_H
@@ -71,7 +61,7 @@ int
putenv (string)
const char *string;
{
- char *name_end = index (string, '=');
+ char *name_end = strchr (string, '=');
register size_t size;
register char **ep;
@@ -106,8 +96,7 @@ putenv (string)
char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
if (new_environ == NULL)
return -1;
- (void) bcopy ((char *) environ, (char *) new_environ,
- size * sizeof (char *));
+ memcpy ((char *) new_environ, (char *) environ, size * sizeof (char *));
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
if (last_environ != NULL)
diff --git a/lib/strftime.c b/lib/strftime.c
index e73cb6f75..484852a72 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -74,19 +74,8 @@
David MacKenzie <djm@gnu.ai.mit.edu> */
-#ifdef emacs
-#define CONFIG_BROKETS
-#endif
-
#ifdef HAVE_CONFIG_H
-#if 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 it found this file in $srcdir). */
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include <stdio.h>
diff --git a/lib/strtod.c b/lib/strtod.c
index d91584072..2f6b894cf 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -1,30 +1,21 @@
/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
-#if 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 it found this file in $srcdir). */
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include <errno.h>