From 544baf5482a56229515f24806f35ab1a847f3504 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 19 Oct 1994 03:39:33 +0000 Subject: merge with 1.9.1h --- src/cat.c | 9 --------- src/cksum.c | 9 --------- src/comm.c | 9 --------- src/csplit.c | 9 --------- src/cut.c | 9 --------- src/expand.c | 9 --------- src/fold.c | 9 --------- src/head.c | 9 --------- src/join.c | 9 --------- src/nl.c | 9 --------- src/od.c | 9 --------- src/paste.c | 9 --------- src/pr.c | 9 --------- src/split.c | 9 --------- src/sum.c | 9 --------- src/tac.c | 9 --------- src/tail.c | 9 --------- src/tr.c | 9 --------- src/unexpand.c | 9 --------- src/uniq.c | 9 --------- src/wc.c | 9 --------- 21 files changed, 189 deletions(-) (limited to 'src') diff --git a/src/cat.c b/src/cat.c index 44fb7885a..415c64606 100644 --- a/src/cat.c +++ b/src/cat.c @@ -22,16 +22,7 @@ By tege@sics.se, Torbjorn Granlund, advised by rms, Richard Stallman. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/cksum.c b/src/cksum.c index 6304c071f..802816d96 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -40,16 +40,7 @@ except foreign language interface (4.9.5.3 of P1003.2/D11.2) support. Any inconsistency with the standard except 4.9.5.3 is a bug. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #ifdef CRCTAB diff --git a/src/comm.c b/src/comm.c index 9f6ddc1ed..3ed34cdf2 100644 --- a/src/comm.c +++ b/src/comm.c @@ -17,16 +17,7 @@ /* Written by Richard Stallman and David MacKenzie. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/csplit.c b/src/csplit.c index b7216cfd7..fa3dd70c0 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -18,16 +18,7 @@ /* Written by Stuart Kemp, cpsrk@groper.jcu.edu.au. Modified by David MacKenzie, djm@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/cut.c b/src/cut.c index edd68f0b8..0087880e4 100644 --- a/src/cut.c +++ b/src/cut.c @@ -59,16 +59,7 @@ A FILE of `-' means standard input. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/expand.c b/src/expand.c index 581960873..fb6774abf 100644 --- a/src/expand.c +++ b/src/expand.c @@ -33,16 +33,7 @@ David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/fold.c b/src/fold.c index 78abbc642..307a7a941 100644 --- a/src/fold.c +++ b/src/fold.c @@ -17,16 +17,7 @@ /* Written by David MacKenzie, djm@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/head.c b/src/head.c index 45a2a6550..5b69dcda9 100644 --- a/src/head.c +++ b/src/head.c @@ -33,16 +33,7 @@ David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/join.c b/src/join.c index 8de6b9433..12c05b3b0 100644 --- a/src/join.c +++ b/src/join.c @@ -17,16 +17,7 @@ Written by Mike Haertel, mike@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/nl.c b/src/nl.c index 976f1ff74..ca98a2b56 100644 --- a/src/nl.c +++ b/src/nl.c @@ -18,16 +18,7 @@ /* Written by Scott Bartram (nancy!scott@uunet.uu.net) Revised by David MacKenzie (djm@gnu.ai.mit.edu) */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/od.c b/src/od.c index 287bbf718..a7ddd4a5d 100644 --- a/src/od.c +++ b/src/od.c @@ -18,16 +18,7 @@ /* Written by Jim Meyering. */ /* AIX requires this to be the first thing in the file. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #ifdef __GNUC__ #define alloca __builtin_alloca diff --git a/src/paste.c b/src/paste.c index fcdf52b26..33a134f73 100644 --- a/src/paste.c +++ b/src/paste.c @@ -38,16 +38,7 @@ A FILE of `-' means standard input. If no FILEs are given, standard input is used. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/pr.c b/src/pr.c index 734173da9..89c84975c 100644 --- a/src/pr.c +++ b/src/pr.c @@ -94,16 +94,7 @@ -w width Set the page width to WIDTH characters. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/split.c b/src/split.c index c8fddc423..3dcfaa0af 100644 --- a/src/split.c +++ b/src/split.c @@ -21,16 +21,7 @@ * Implement -t CHAR or -t REGEX to specify break characters other than newline. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/sum.c b/src/sum.c index bf7003cab..6c68c0b1a 100644 --- a/src/sum.c +++ b/src/sum.c @@ -19,16 +19,7 @@ /* Written by Kayvan Aghaiepour and David MacKenzie. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/tac.c b/src/tac.c index f5669a91a..d4326a604 100644 --- a/src/tac.c +++ b/src/tac.c @@ -35,16 +35,7 @@ tac -r -s '.\| ' file */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/tail.c b/src/tail.c index f96f804a1..87983253c 100644 --- a/src/tail.c +++ b/src/tail.c @@ -45,16 +45,7 @@ Extensions by David MacKenzie . tail -f for multiple files by Ian Lance Taylor . */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/tr.c b/src/tr.c index 7e1f3a2c5..f4ec9e0e8 100644 --- a/src/tr.c +++ b/src/tr.c @@ -17,16 +17,7 @@ /* Written by Jim Meyering, meyering@cs.utexas.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/unexpand.c b/src/unexpand.c index 46d820c7c..97d3569c3 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -35,16 +35,7 @@ David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/uniq.c b/src/uniq.c index dd36103ae..c4a05edbb 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -17,16 +17,7 @@ /* Written by Richard Stallman and David MacKenzie. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/wc.c b/src/wc.c index 904efe5c9..62da90646 100644 --- a/src/wc.c +++ b/src/wc.c @@ -18,16 +18,7 @@ /* Written by Paul Rubin, phr@ocf.berkeley.edu and David MacKenzie, djm@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use 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 -#else -#include "config.h" -#endif -#endif #include #include -- cgit v1.2.3-54-g00ecf