git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Back out controversial fix. 

From-SVN: r89851
This commit is contained in:
Mike Stump 2004-10-29 21:16:51 +00:00
parent a53f986f91
commit 976c217af8
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fixincludes/ChangeLog
View File

@ -1,9 +1,3 @@
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> 2004-10-28 Mike Stump <mrs@apple.com>
* inclhack.def (void_null): Avoid changing NULL on C++ friendly * inclhack.def (void_null): Avoid changing NULL on C++ friendly

13
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * 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 * From the definitions inclhack.def
* and the template file fixincl * 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. * You must regenerate it. Use the ./genfixes script.
* *
@ -4927,13 +4927,10 @@ tSCC zStdio_Va_ListList[] =
*/ */
tSCC zStdio_Va_ListBypass0[] = tSCC zStdio_Va_ListBypass0[] =
"__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list"; "__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[] = { static tTestDesc aStdio_Va_ListTests[] = {
{ TT_NEGREP, zStdio_Va_ListBypass0, (regex_t*)NULL }, { TT_NEGREP, zStdio_Va_ListBypass0, (regex_t*)NULL }, };
{ TT_NEGREP, zStdio_Va_ListBypass1, (regex_t*)NULL }, };
/* /*
* Fix Command Arguments for Stdio_Va_List * Fix Command Arguments for Stdio_Va_List
@ -7149,7 +7146,7 @@ static const char* apzX11_SprintfPatch[] = {
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 205 #define REGEX_COUNT 204
#define MACH_LIST_SIZE_LIMIT 261 #define MACH_LIST_SIZE_LIMIT 261
#define FIX_COUNT 180 #define FIX_COUNT 180

3
fixincludes/inclhack.def
View File

@ -2715,9 +2715,6 @@ fix = {
files = wchar.h; files = wchar.h;
files = curses_colr/curses.h; files = curses_colr/curses.h;
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list'; 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. * Use __gnuc_va_list in arg types in place of va_list.