diff options
| author | peter <peter@FreeBSD.org> | 1995-10-28 19:11:01 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-10-28 19:11:01 +0000 |
| commit | c37ff62e9be62a7cd6340caca3316bb40062ac2d (patch) | |
| tree | 987fcf998a10323a27da08d8512088fb01e8396f /gnu/usr.bin/diff/getopt1.c | |
| parent | 72fa7ec057bc2d7930e60d59f3936afe1de4bc11 (diff) | |
| download | FreeBSD-src-c37ff62e9be62a7cd6340caca3316bb40062ac2d.zip FreeBSD-src-c37ff62e9be62a7cd6340caca3316bb40062ac2d.tar.gz | |
Merge in/out comflicts caused by Diffutils-2.7 import...
In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand. Not nice..
Diffstat (limited to 'gnu/usr.bin/diff/getopt1.c')
| -rw-r--r-- | gnu/usr.bin/diff/getopt1.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gnu/usr.bin/diff/getopt1.c b/gnu/usr.bin/diff/getopt1.c index f784b57..17ab331 100644 --- a/gnu/usr.bin/diff/getopt1.c +++ b/gnu/usr.bin/diff/getopt1.c @@ -17,15 +17,8 @@ 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" |
