X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=fixincludes%2Ffixincl.x;h=e80d50c5adcc7ac3dfaa80ca00430fc0946da3e2;hb=529f23cd8bab3c1b5e0d4fafd0e49faadf43cf29;hp=395b6b49124cc91470127962ceafa1fe0d8bae10;hpb=53c3157fac7af9059d64ae5c0220f93d00595c7f;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 395b6b49124..e80d50c5adc 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  Wednesday March 24, 2010 at 02:21:16 PM PDT
+ * It has been AutoGen-ed  Wednesday April  7, 2010 at 05:11:50 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Mar 24 14:21:16 PDT 2010
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Apr  7 17:11:50 MEST 2010
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 206 fixup descriptions.
+ * This file contains 205 fixup descriptions.
  *
  * See README for more information.
  *
@@ -1043,7 +1043,7 @@ tSCC zAlpha_AssertList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zAlpha_AssertSelect0[] =
-       "(#define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
+       "(#[ \t]*define assert\\(EX\\).*)\\(\\(int\\) \\(EX\\)\\)";
 
 #define    ALPHA_ASSERT_TEST_CT  1
 static tTestDesc aAlpha_AssertTests[] = {
@@ -1354,43 +1354,6 @@ static const char* apzAlpha_SbrkPatch[] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
- *  Description of Alpha_Wchar fix
- */
-tSCC zAlpha_WcharName[] =
-     "alpha_wchar";
-
-/*
- *  File name selection pattern
- */
-tSCC zAlpha_WcharList[] =
-  "wchar.h\0";
-/*
- *  Machine/OS name selection pattern
- */
-tSCC* apzAlpha_WcharMachs[] = {
-        "alpha*-dec-osf4*",
-        (const char*)NULL };
-
-/*
- *  content selection pattern - do fix if pattern found
- */
-tSCC zAlpha_WcharSelect0[] =
-       "#define wcstok wcstok_r";
-
-#define    ALPHA_WCHAR_TEST_CT  1
-static tTestDesc aAlpha_WcharTests[] = {
-  { TT_EGREP,    zAlpha_WcharSelect0, (regex_t*)NULL }, };
-
-/*
- *  Fix Command Arguments for Alpha_Wchar
- */
-static const char* apzAlpha_WcharPatch[] = { sed_cmd_z,
-    "-e", "s@#define wcstok wcstok_r@extern wchar_t *wcstok __((wchar_t *, const wchar_t *, wchar_t **)) __asm__(\"wcstok_r\");@",
-    "-e", "s@#define wcsftime __wcsftime_isoc@extern size_t   wcsftime __((wchar_t *, size_t, const wchar_t *, const struct tm *)) __asm__(\"__wcsftime_isoc\");@",
-    (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
  *  Description of Avoid_Bool_Define fix
  */
 tSCC zAvoid_Bool_DefineName[] =
@@ -8395,9 +8358,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          246
+#define REGEX_COUNT          245
 #define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT            206
+#define FIX_COUNT            205
 
 /*
  *  Enumerate the fixes
@@ -8434,7 +8397,6 @@ typedef enum {
     ALPHA_PTHREAD_GCC_FIXIDX,
     ALPHA_PTHREAD_INIT_FIXIDX,
     ALPHA_SBRK_FIXIDX,
-    ALPHA_WCHAR_FIXIDX,
     AVOID_BOOL_DEFINE_FIXIDX,
     AVOID_BOOL_TYPE_FIXIDX,
     AVOID_WCHAR_T_TYPE_FIXIDX,
@@ -8767,11 +8729,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aAlpha_SbrkTests,   apzAlpha_SbrkPatch, 0 },
 
-  {  zAlpha_WcharName,    zAlpha_WcharList,
-     apzAlpha_WcharMachs,
-     ALPHA_WCHAR_TEST_CT, FD_MACH_ONLY,
-     aAlpha_WcharTests,   apzAlpha_WcharPatch, 0 },
-
   {  zAvoid_Bool_DefineName,    zAvoid_Bool_DefineList,
      apzAvoid_Bool_DefineMachs,
      AVOID_BOOL_DEFINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,