diff options
| author | Jim Meyering <jim@meyering.net> | 1994-09-27 22:02:00 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1994-09-27 22:02:00 +0000 |
| commit | 0a0800fe2507f48a2ae246d148b6f2b056109e04 (patch) | |
| tree | fd947e3bd752610de97b43df7b79b0758be6730d | |
| parent | e13a0b7f4982846cb8165e5188bd306ce8499445 (diff) | |
| download | coreutils-0a0800fe2507f48a2ae246d148b6f2b056109e04.tar.xz | |
merge with 1.10n2
| -rw-r--r-- | lib/group-member.c | 7 | ||||
| -rw-r--r-- | lib/mktime.c | 32 | ||||
| -rw-r--r-- | lib/putenv.c | 84 | ||||
| -rw-r--r-- | lib/strtod.c | 84 | ||||
| -rw-r--r-- | lib/xgethostname.c | 7 | ||||
| -rw-r--r-- | old/sh-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | src/basename.c | 7 | ||||
| -rw-r--r-- | src/date.c | 7 | ||||
| -rw-r--r-- | src/dirname.c | 7 | ||||
| -rw-r--r-- | src/echo.c | 7 | ||||
| -rw-r--r-- | src/env.c | 7 | ||||
| -rw-r--r-- | src/expr.c | 7 | ||||
| -rw-r--r-- | src/hostname.c | 7 | ||||
| -rw-r--r-- | src/id.c | 7 | ||||
| -rw-r--r-- | src/logname.c | 7 | ||||
| -rw-r--r-- | src/nice.c | 7 | ||||
| -rw-r--r-- | src/pathchk.c | 7 | ||||
| -rw-r--r-- | src/printenv.c | 7 | ||||
| -rw-r--r-- | src/printf.c | 7 | ||||
| -rw-r--r-- | src/pwd.c | 7 | ||||
| -rw-r--r-- | src/sleep.c | 7 | ||||
| -rw-r--r-- | src/stty.c | 7 | ||||
| -rw-r--r-- | src/su.c | 7 | ||||
| -rw-r--r-- | src/tee.c | 7 | ||||
| -rw-r--r-- | src/test.c | 7 | ||||
| -rw-r--r-- | src/tty.c | 7 | ||||
| -rw-r--r-- | src/uname.c | 7 | ||||
| -rw-r--r-- | src/who.c | 7 | ||||
| -rw-r--r-- | src/whoami.c | 7 | ||||
| -rw-r--r-- | src/yes.c | 9 |
30 files changed, 83 insertions, 307 deletions
diff --git a/lib/group-member.c b/lib/group-member.c index f9bb8fcd4..05b1bc0d7 100644 --- a/lib/group-member.c +++ b/lib/group-member.c @@ -16,14 +16,7 @@ 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 <stdio.h> diff --git a/lib/mktime.c b/lib/mktime.c index 74167e528..b80c5064c 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -3,36 +3,30 @@ Michael E. Calwas (calwas@ttd.teradyne.com) and Wade Hampton (tasi029@tmn.com). -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. +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@prep.ai.mit.edu. -The GNU C Library is distributed in the hope that it will be useful, +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. + +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 -Library General Public License for more details. +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, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Define this to have a standalone program to test this implementation of mktime. */ /* #define DEBUG */ #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> /* Some systems define `time_t' here. */ diff --git a/lib/putenv.c b/lib/putenv.c index 06e3254b6..9ba55a70f 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -1,76 +1,46 @@ /* Copyright (C) 1991 Free Software Foundation, Inc. - 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. +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@prep.ai.mit.edu. - 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. +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. - 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. */ +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. -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <sys/types.h> +#include <ansidecl.h> #include <errno.h> -#ifndef errno -extern int errno; -#endif - -/* 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__ #include <stdlib.h> -#else -char *malloc (); -#endif /* GNU C library. */ - -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) #include <string.h> -#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 #include <unistd.h> -#endif -#ifndef NULL -#define NULL 0 +#ifndef HAVE_GNU_LD +#define __environ environ #endif -extern char **environ; - /* Put STRING, which is of the form "NAME=VALUE", in the environment. */ int -putenv (string) - const char *string; +DEFUN(putenv, (string), CONST char *string) { - char *name_end = strchr (string, '='); + CONST char *CONST name_end = strchr(string, '='); register size_t size; register char **ep; if (name_end == NULL) { /* Remove the variable from the environment. */ - size = strlen (string); - for (ep = environ; *ep != NULL; ++ep) - if (!strncmp (*ep, string, size) && (*ep)[size] == '=') + size = strlen(string); + for (ep = __environ; *ep != NULL; ++ep) + if (!strncmp(*ep, string, size) && (*ep)[size] == '=') { while (ep[1] != NULL) { @@ -83,8 +53,8 @@ putenv (string) } size = 0; - for (ep = environ; *ep != NULL; ++ep) - if (!strncmp (*ep, string, name_end - string) && + for (ep = __environ; *ep != NULL; ++ep) + if (!strncmp(*ep, string, name_end - string) && (*ep)[name_end - string] == '=') break; else @@ -93,16 +63,16 @@ putenv (string) if (*ep == NULL) { static char **last_environ = NULL; - char **new_environ = (char **) malloc ((size + 2) * sizeof (char *)); + char **new_environ = (char **) malloc((size + 2) * sizeof(char *)); if (new_environ == NULL) return -1; - memcpy ((char *) new_environ, (char *) environ, size * sizeof (char *)); + (void) memcpy((PTR) new_environ, (PTR) __environ, size * sizeof(char *)); new_environ[size] = (char *) string; new_environ[size + 1] = NULL; if (last_environ != NULL) - free ((char *) last_environ); + free((PTR) last_environ); last_environ = new_environ; - environ = new_environ; + __environ = new_environ; } else *ep = (char *) string; diff --git a/lib/strtod.c b/lib/strtod.c index 2f6b894cf..34b82232e 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -1,60 +1,46 @@ /* Copyright (C) 1991, 1992 Free Software Foundation, Inc. - 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. +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@prep.ai.mit.edu. - 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. +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. - 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. */ +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. -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <ansidecl.h> +#include <localeinfo.h> #include <errno.h> -#include <ctype.h> -#include <math.h> - -#ifdef HAVE_FLOAT_H #include <float.h> -#else -#define DBL_MAX 1.7976931348623159e+308 -#define DBL_MIN 2.2250738585072010e-308 -#endif - -#if STDC_HEADERS +#include <ctype.h> #include <stdlib.h> #include <string.h> -#else -#define NULL 0 -extern int errno; -#ifndef HUGE_VAL -#define HUGE_VAL HUGE -#endif -#endif +#include <math.h> + /* Convert NPTR to a double. If ENDPTR is not NULL, a pointer to the character after the last one used in the number is put in *ENDPTR. */ double -strtod (nptr, endptr) - const char *nptr; - char **endptr; +DEFUN(strtod, (nptr, endptr), CONST char *nptr AND char **endptr) { - register const char *s; + register CONST char *s; short int sign; + wchar_t decimal; /* Decimal point character. */ /* The number so far. */ double num; - int got_dot; /* Found a decimal point. */ - int got_digit; /* Seen any digits. */ + int got_dot; /* Found a decimal point. */ + int got_digit; /* Seen any digits. */ /* The exponent of the number. */ long int exponent; @@ -65,10 +51,14 @@ strtod (nptr, endptr) goto noconv; } + /* Figure out the decimal point character. */ + if (mbtowc(&decimal, _numeric_info->decimal_point, 1) <= 0) + decimal = (wchar_t) *_numeric_info->decimal_point; + s = nptr; /* Eat whitespace. */ - while (isspace (*s)) + while (isspace(*s)) ++s; /* Get the sign. */ @@ -104,7 +94,7 @@ strtod (nptr, endptr) if (got_dot) --exponent; } - else if (!got_dot && *s == '.') + else if (!got_dot && (wchar_t) *s == decimal) /* Record that we have found the decimal point. */ got_dot = 1; else @@ -115,7 +105,7 @@ strtod (nptr, endptr) if (!got_digit) goto noconv; - if (tolower (*s) == 'e') + if (tolower(*s) == 'e') { /* Get the exponent specified after the `e' or `E'. */ int save = errno; @@ -124,7 +114,7 @@ strtod (nptr, endptr) errno = 0; ++s; - exp = strtol (s, &end, 10); + exp = strtol(s, &end, 10); if (errno == ERANGE) { /* The exponent overflowed a `long int'. It is probably a safe @@ -157,32 +147,32 @@ strtod (nptr, endptr) if (exponent < 0) { - if (num < DBL_MIN * pow (10.0, (double) -exponent)) + if (num < DBL_MIN * pow(10.0, (double) -exponent)) goto underflow; } else if (exponent > 0) { - if (num > DBL_MAX * pow (10.0, (double) -exponent)) + if (num > DBL_MAX * pow(10.0, (double) -exponent)) goto overflow; } - num *= pow (10.0, (double) exponent); + num *= pow(10.0, (double) exponent); return num * sign; -overflow: + overflow: /* Return an overflow error. */ errno = ERANGE; return HUGE_VAL * sign; -underflow: + underflow: /* Return an underflow error. */ if (endptr != NULL) *endptr = (char *) nptr; errno = ERANGE; return 0.0; -noconv: + noconv: /* There was no number. */ if (endptr != NULL) *endptr = (char *) nptr; diff --git a/lib/xgethostname.c b/lib/xgethostname.c index 9973b45be..216e78be4 100644 --- a/lib/xgethostname.c +++ b/lib/xgethostname.c @@ -18,14 +18,7 @@ /* Written by Jim Meyering, meyering@comco.com */ #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> diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index bbe99870c..5e84852c2 100644 --- a/old/sh-utils/ChangeLog +++ b/old/sh-utils/ChangeLog @@ -1,7 +1,11 @@ + + * lib/*.c, src/*.c: Remove CONFIG_BROKETS conditional. + * lib/Makefile.in src/Makefile.in: Don't define it. + configure.in (AC_CHECK_FUNCS): Add getcwd. From Kaveh Ghazi. * safe-xstat.c.in, safe-xstat.h.in: Rename to safe-xstat.cin and - safe-xstat.hin so the names don't exceed 14-character limit. + safe-xstat.hin so the names don't exceed the 14-character limit. Reported by Kaveh Ghazi. Mon Sep 26 19:49:40 1994 Jim Meyering (meyering@comco.com) diff --git a/src/basename.c b/src/basename.c index 835f229a6..10726d225 100644 --- a/src/basename.c +++ b/src/basename.c @@ -26,14 +26,7 @@ => functions.lis */ #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/src/date.c b/src/date.c index 36a77fee4..e22ba8512 100644 --- a/src/date.c +++ b/src/date.c @@ -40,14 +40,7 @@ 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 #include <stdio.h> diff --git a/src/dirname.c b/src/dirname.c index 09b55464f..22e983dd2 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -18,14 +18,7 @@ /* Written by David MacKenzie and Jim Meyering. */ #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/src/echo.c b/src/echo.c index d1d25d5ec..ea7510e63 100644 --- a/src/echo.c +++ b/src/echo.c @@ -18,14 +18,7 @@ with Bash; see the file COPYING. If not, write to the Free Software Foundation, 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 <stdio.h> @@ -78,14 +78,7 @@ */ #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/src/expr.c b/src/expr.c index 7c77938c4..7cf9110b3 100644 --- a/src/expr.c +++ b/src/expr.c @@ -29,14 +29,7 @@ Define EVAL_TRACE to print an evaluation trace. */ #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/src/hostname.c b/src/hostname.c index d49aa1c48..2a7939864 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -18,14 +18,7 @@ /* Jim Meyering <meyering@comco.com> */ #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> @@ -19,14 +19,7 @@ Major rewrite 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 #include <stdio.h> diff --git a/src/logname.c b/src/logname.c index a7b3675fa..bc21afcd4 100644 --- a/src/logname.c +++ b/src/logname.c @@ -16,14 +16,7 @@ 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 <stdio.h> diff --git a/src/nice.c b/src/nice.c index acf636468..444131f7a 100644 --- a/src/nice.c +++ b/src/nice.c @@ -18,14 +18,7 @@ /* 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 #include <stdio.h> diff --git a/src/pathchk.c b/src/pathchk.c index 7d75a35c7..3b7c8e534 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -39,14 +39,7 @@ and Jim Meyering <meyering@cs.utexas.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 #include <stdio.h> diff --git a/src/printenv.c b/src/printenv.c index f7118ab77..4ddaeba8c 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -28,14 +28,7 @@ David MacKenzie and Richard Mlynarik */ #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/src/printf.c b/src/printf.c index 2719053c1..c4728114e 100644 --- a/src/printf.c +++ b/src/printf.c @@ -44,14 +44,7 @@ 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 #include <stdio.h> @@ -18,14 +18,7 @@ /* Jim Meyering <meyering@comco.com> */ #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/src/sleep.c b/src/sleep.c index 7172866b8..dda1ea48a 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -16,14 +16,7 @@ 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 <stdio.h> diff --git a/src/stty.c b/src/stty.c index c1dc3e408..5efeb243b 100644 --- a/src/stty.c +++ b/src/stty.c @@ -28,14 +28,7 @@ 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 #include <stdio.h> @@ -70,14 +70,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 #include <stdio.h> @@ -18,14 +18,7 @@ /* Mike Parker, Richard M. Stallman, and David MacKenzie */ #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/src/test.c b/src/test.c index 568af97f9..7aefb0a46 100644 --- a/src/test.c +++ b/src/test.c @@ -25,14 +25,7 @@ /* #define TEST_STANDALONE */ #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> @@ -23,14 +23,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 #include <stdio.h> diff --git a/src/uname.c b/src/uname.c index 4f0fda9bb..ae34b543c 100644 --- a/src/uname.c +++ b/src/uname.c @@ -29,14 +29,7 @@ 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 #include <stdio.h> @@ -33,14 +33,7 @@ -w, -T -s plus mesg (+ or -, or ? if bad line). */ #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/src/whoami.c b/src/whoami.c index 68d715350..6bb43153f 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -19,14 +19,7 @@ /* Written by Richard Mlynarik. */ #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> @@ -18,14 +18,7 @@ /* 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 #include <stdio.h> |