From c37ff62e9be62a7cd6340caca3316bb40062ac2d Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 28 Oct 1995 19:11:01 +0000 Subject: 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.. --- gnu/usr.bin/diff/getopt1.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/usr.bin/diff/getopt1.c') 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 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 "getopt.h" -- cgit v1.1