Commit 42ab9282 by Giovanni Bajo Committed by Bruce Korb

add alpha_if_semocolon fix

From-SVN: r144490
parent 7d01864f
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed Monday January 5, 2009 at 09:53:36 AM PST * It has been AutoGen-ed Saturday February 28, 2009 at 10:11:41 AM PST
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jan 5 09:53:36 PST 2009 /* DO NOT SVN-MERGE THIS FILE, EITHER Sat Feb 28 10:11:41 PST 2009
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* certain ANSI-incompatible system header files which are fixed to work * 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. * correctly with ANSI C and placed in a directory that GNU C will search.
* *
* This file contains 179 fixup descriptions. * This file contains 180 fixup descriptions.
* *
* See README for more information. * See README for more information.
* *
...@@ -918,6 +918,41 @@ static const char* apzAlpha_GetoptPatch[] = { ...@@ -918,6 +918,41 @@ static const char* apzAlpha_GetoptPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description of Alpha_If_Semicolon fix
*/
tSCC zAlpha_If_SemicolonName[] =
"alpha_if_semicolon";
/*
* File name selection pattern
*/
tSCC zAlpha_If_SemicolonList[] =
"net/if.h\0";
/*
* Machine/OS name selection pattern
*/
#define apzAlpha_If_SemicolonMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zAlpha_If_SemicolonSelect0[] =
"struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
#define ALPHA_IF_SEMICOLON_TEST_CT 1
static tTestDesc aAlpha_If_SemicolonTests[] = {
{ TT_EGREP, zAlpha_If_SemicolonSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Alpha_If_Semicolon
*/
static const char* apzAlpha_If_SemicolonPatch[] = {
"format",
"struct sockaddr vmif_paddr;\t/*",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Alpha_Parens fix * Description of Alpha_Parens fix
*/ */
tSCC zAlpha_ParensName[] = tSCC zAlpha_ParensName[] =
...@@ -7273,9 +7308,9 @@ static const char* apzX11_SprintfPatch[] = { ...@@ -7273,9 +7308,9 @@ static const char* apzX11_SprintfPatch[] = {
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 225 #define REGEX_COUNT 226
#define MACH_LIST_SIZE_LIMIT 181 #define MACH_LIST_SIZE_LIMIT 181
#define FIX_COUNT 179 #define FIX_COUNT 180
/* /*
* Enumerate the fixes * Enumerate the fixes
...@@ -7301,6 +7336,7 @@ typedef enum { ...@@ -7301,6 +7336,7 @@ typedef enum {
ALPHA_ASSERT_FIXIDX, ALPHA_ASSERT_FIXIDX,
ALPHA_BAD_LVAL_FIXIDX, ALPHA_BAD_LVAL_FIXIDX,
ALPHA_GETOPT_FIXIDX, ALPHA_GETOPT_FIXIDX,
ALPHA_IF_SEMICOLON_FIXIDX,
ALPHA_PARENS_FIXIDX, ALPHA_PARENS_FIXIDX,
ALPHA_PTHREAD_FIXIDX, ALPHA_PTHREAD_FIXIDX,
ALPHA_PTHREAD_GCC_FIXIDX, ALPHA_PTHREAD_GCC_FIXIDX,
...@@ -7563,6 +7599,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ...@@ -7563,6 +7599,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ALPHA_GETOPT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_GetoptTests, apzAlpha_GetoptPatch, 0 }, aAlpha_GetoptTests, apzAlpha_GetoptPatch, 0 },
{ zAlpha_If_SemicolonName, zAlpha_If_SemicolonList,
apzAlpha_If_SemicolonMachs,
ALPHA_IF_SEMICOLON_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAlpha_If_SemicolonTests, apzAlpha_If_SemicolonPatch, 0 },
{ zAlpha_ParensName, zAlpha_ParensList, { zAlpha_ParensName, zAlpha_ParensList,
apzAlpha_ParensMachs, apzAlpha_ParensMachs,
ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ALPHA_PARENS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
......
...@@ -563,6 +563,19 @@ fix = { ...@@ -563,6 +563,19 @@ fix = {
/* /*
* Fix missing semicolon on Alpha OSF/4 in <net/if.h>
*/
fix = {
hackname = alpha_if_semicolon;
files = net/if.h;
select = "struct[ \t]+sockaddr[ \t]+vmif_paddr[ \t]+/\\*";
c_fix = format;
c_fix_arg = "struct sockaddr vmif_paddr;\t/*";
test_text = ' struct sockaddr vmif_paddr /* protocol address */';
};
/*
* Remove erroneous parentheses in sym.h on Alpha OSF/1. * Remove erroneous parentheses in sym.h on Alpha OSF/1.
*/ */
fix = { fix = {
......
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/net/if.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( ALPHA_IF_SEMICOLON_CHECK )
struct sockaddr vmif_paddr; /* protocol address */
#endif /* ALPHA_IF_SEMICOLON_CHECK */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment