diff options
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/fixincl.x | 10 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 9 | ||||
| -rw-r--r-- | fixincludes/tests/base/sys/socket.h | 1 |
3 files changed, 13 insertions, 7 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index cc17edf..6c50e97 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 December 9, 2020 at 11:16:08 AM by AutoGen 5.18.16 + * It has been AutoGen-ed July 1, 2021 at 03:44:46 PM by AutoGen 5.18.7 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Dec 9 11:16:08 EST 2020 +/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jul 1 15:44:46 CEST 2021 * * You must regenerate it. Use the ./genfixes script. * @@ -827,7 +827,8 @@ tSCC* apzAix_Externcpp1Machs[] = { */ tSCC zAix_Externcpp1Select0[] = "#ifndef _KERNEL\n\ -#ifdef __cplusplus"; +#ifdef __cplusplus\n\ +extern \"C\" int naccept\\(int, struct sockaddr \\*, socklen_t \\*\\);"; #define AIX_EXTERNCPP1_TEST_CT 1 static tTestDesc aAix_Externcpp1Tests[] = { @@ -840,7 +841,8 @@ static const char* apzAix_Externcpp1Patch[] = { "format", "#ifndef _KERNEL\n\ #ifdef __cplusplus\n\ -extern \"C++\" {", +extern \"C++\" {\n\ +extern \"C\" int naccept(int, struct sockaddr *, socklen_t *);", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 4db3117..b7ad698 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -554,13 +554,16 @@ fix = { mach = "*-*-aix*"; files = "sys/socket.h"; select = "#ifndef _KERNEL\n" - "#ifdef __cplusplus"; + "#ifdef __cplusplus\n" + "extern \"C\" int naccept\\(int, struct sockaddr \\*, socklen_t \\*\\);"; c_fix = format; c_fix_arg = "#ifndef _KERNEL\n" "#ifdef __cplusplus\n" - "extern \"C++\" {"; + "extern \"C++\" {\n" + "extern \"C\" int naccept(int, struct sockaddr *, socklen_t *);"; test_text = "#ifndef _KERNEL\n" - "#ifdef __cplusplus"; + "#ifdef __cplusplus\n" + "extern \"C\" int naccept(int, struct sockaddr *, socklen_t *);"; }; fix = { diff --git a/fixincludes/tests/base/sys/socket.h b/fixincludes/tests/base/sys/socket.h index c1e2b42..588a378 100644 --- a/fixincludes/tests/base/sys/socket.h +++ b/fixincludes/tests/base/sys/socket.h @@ -13,6 +13,7 @@ #ifndef _KERNEL #ifdef __cplusplus extern "C++" { +extern "C" int naccept(int, struct sockaddr *, socklen_t *); #endif /* AIX_EXTERNCPP1_CHECK */ |