From 96be725f3558411c453acf315ebd52a0737bd475 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 13 Nov 1995 05:16:38 +0000 Subject: [PATCH] options.h is now <> instead of "" so shadow build trees can have a custom copy of options.h --- find_path.c | 2 +- getwd.c | 2 +- goodpath.c | 2 +- interfaces.c | 2 +- logging.c | 2 +- parse.c | 2 +- parse.lex | 2 +- parse.yacc | 2 +- sudo.c | 2 +- sudo.h | 2 +- sudo_setenv.c | 2 +- tgetpass.c | 2 +- utime.c | 2 +- visudo.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/find_path.c b/find_path.c index 35b102e68..e549d71ef 100644 --- a/find_path.c +++ b/find_path.c @@ -56,7 +56,7 @@ static char rcsid[] = "$Id$"; #include #include #include "sudo.h" -#include "options.h" +#include #ifndef STDC_HEADERS #ifndef __GNUC__ /* gcc has its own malloc */ diff --git a/getwd.c b/getwd.c index 8a4cc5ce0..61b27154d 100644 --- a/getwd.c +++ b/getwd.c @@ -51,7 +51,7 @@ static char rcsid[] = "$Id$"; #include #include -#include "pathnames.h" +#include #include "compat.h" #ifndef STDC_HEADERS diff --git a/goodpath.c b/goodpath.c index ffcccc52d..17ffcc3bf 100644 --- a/goodpath.c +++ b/goodpath.c @@ -51,7 +51,7 @@ static char rcsid[] = "$Id$"; #include #include "sudo.h" -#include "options.h" +#include #ifndef STDC_HEADERS extern int stat __P((const char *, struct stat *)); diff --git a/interfaces.c b/interfaces.c index bd07b7dab..22693e226 100644 --- a/interfaces.c +++ b/interfaces.c @@ -77,7 +77,7 @@ static char rcsid[] = "$Id$"; #include #include "sudo.h" -#include "options.h" +#include #include "version.h" #if !defined(STDC_HEADERS) && !defined(__GNUC__) diff --git a/logging.c b/logging.c index 049972e95..7506071b7 100644 --- a/logging.c +++ b/logging.c @@ -68,7 +68,7 @@ static char rcsid[] = "$Id$"; #include #include "sudo.h" -#include "options.h" +#include /* * Prototypes for local functions diff --git a/parse.c b/parse.c index d21a02977..0a62ad315 100644 --- a/parse.c +++ b/parse.c @@ -71,7 +71,7 @@ static char rcsid[] = "$Id$"; #endif #include "sudo.h" -#include "options.h" +#include extern FILE *yyin, *yyout; diff --git a/parse.lex b/parse.lex index 1072d3589..6c792615d 100644 --- a/parse.lex +++ b/parse.lex @@ -48,7 +48,7 @@ static char rcsid[] = "$Id$"; #include #include #include "sudo.h" -#include "options.h" +#include #include "y.tab.h" #undef yywrap /* guard against a yywrap macro */ diff --git a/parse.yacc b/parse.yacc index c22024e4d..ba59ff151 100644 --- a/parse.yacc +++ b/parse.yacc @@ -51,7 +51,7 @@ static char rcsid[] = "$Id$"; #endif /* HAVE_LSEARCH */ #include "sudo.h" -#include "options.h" +#include #ifndef HAVE_LSEARCH #include "emul/search.h" diff --git a/sudo.c b/sudo.c index 04ee06a60..42bc55663 100644 --- a/sudo.c +++ b/sudo.c @@ -88,7 +88,7 @@ static char rcsid[] = "$Id$"; #endif /* __osf__ && HAVE_C2_SECURITY */ #include "sudo.h" -#include "options.h" +#include #include "version.h" #ifndef STDC_HEADERS diff --git a/sudo.h b/sudo.h index ca0768fce..5a4dd2d31 100644 --- a/sudo.h +++ b/sudo.h @@ -31,8 +31,8 @@ #ifndef _SUDO_SUDO_H #define _SUDO_SUDO_H +#include #include "compat.h" -#include "pathnames.h" /* * IP address and netmask pairs for checking against local interfaces. diff --git a/sudo_setenv.c b/sudo_setenv.c index a3315c5ca..756328300 100644 --- a/sudo_setenv.c +++ b/sudo_setenv.c @@ -46,7 +46,7 @@ static char rcsid[] = "$Id$"; #include #include "sudo.h" -#include "options.h" +#include #ifndef STDC_HEADERS #ifdef HAVE_PUTENV diff --git a/tgetpass.c b/tgetpass.c index eb7c94c54..ec33d6f41 100644 --- a/tgetpass.c +++ b/tgetpass.c @@ -61,7 +61,7 @@ static char rcsid[] = "$Id$"; #endif /* HAVE_TERMIO_H */ #endif /* HAVE_TERMIOS_H */ -#include "pathnames.h" +#include #include "compat.h" #ifndef _PASSWD_LEN diff --git a/utime.c b/utime.c index 424a8166f..3f086c597 100644 --- a/utime.c +++ b/utime.c @@ -39,7 +39,7 @@ static char rcsid[] = "$Id$"; #include #include -#include "pathnames.h" +#include #include "compat.h" #include "emul/utime.h" diff --git a/visudo.c b/visudo.c index 7b8191ca1..e2848b052 100644 --- a/visudo.c +++ b/visudo.c @@ -59,7 +59,7 @@ static char rcsid[] = "$Id$"; #include #include "sudo.h" -#include "options.h" +#include #include "version.h" #ifndef STDC_HEADERS -- 2.40.0