diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-29 21:16:51 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-29 21:16:51 +0000 |
| commit | ce225e8d9a31a9c7609f2e435038757e73d32613 (patch) | |
| tree | d1a5df35daa277efec9976de3042c9ab8386a714 | |
| parent | ec5a89c1010cfed710acd973d290b68176c92805 (diff) | |
| download | gcc-ce225e8d9a31a9c7609f2e435038757e73d32613.tar.gz | |
Back out controversial fix.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89851 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | fixincludes/ChangeLog | 6 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 13 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 3 |
3 files changed, 5 insertions, 17 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 6fba0c3d455..fbda61e2ecf 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,11 +1,5 @@ 2004-10-28 Mike Stump <mrs@apple.com> - * inclhack.def (stdio_va_list): Don't fix if stdarg.h is - included or ifdef va_start. - * fixincl.x: Regenerate. - -2004-10-28 Mike Stump <mrs@apple.com> - * inclhack.def (void_null): Avoid changing NULL on C++ friendly systems. * fixincl.x: Regenerate. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 781c9383f09..eff337673c3 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Thursday October 28, 2004 at 07:37:27 PM PDT + * It has been AutoGen-ed Friday October 29, 2004 at 02:14:23 PM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Oct 28 19:37:27 PDT 2004 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Oct 29 14:14:23 PDT 2004 * * You must regenerate it. Use the ./genfixes script. * @@ -4927,13 +4927,10 @@ tSCC zStdio_Va_ListList[] = */ tSCC zStdio_Va_ListBypass0[] = "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; -tSCC zStdio_Va_ListBypass1[] = - "include <stdarg\\.h>|#ifdef va_start"; -#define STDIO_VA_LIST_TEST_CT 2 +#define STDIO_VA_LIST_TEST_CT 1 static tTestDesc aStdio_Va_ListTests[] = { - { TT_NEGREP, zStdio_Va_ListBypass0, (regex_t*)NULL }, - { TT_NEGREP, zStdio_Va_ListBypass1, (regex_t*)NULL }, }; + { TT_NEGREP, zStdio_Va_ListBypass0, (regex_t*)NULL }, }; /* * Fix Command Arguments for Stdio_Va_List @@ -7149,7 +7146,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 205 +#define REGEX_COUNT 204 #define MACH_LIST_SIZE_LIMIT 261 #define FIX_COUNT 180 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 30d8065db45..1e090144eb0 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -2715,9 +2715,6 @@ fix = { files = wchar.h; files = curses_colr/curses.h; bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list'; - /* Don't fix, if we use va_list from stdarg.h, or if the use is - otherwise protected. */ - bypass = 'include <stdarg\.h>|#ifdef va_start'; /* * Use __gnuc_va_list in arg types in place of va_list. |