OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixincludes: AIX socket.h. 

Add more context to aix_externcpp1 selection to ensure
that the fix is correctly applied even in future AIX versions.

fixincludes/Changelog:
2021-07-01  Clément Chigot  <clement.chigot@atos.net>

	* inclhack.def (aix_externcpp1): Improve select regexp.
	* fixincl.x: Regenerate.
	* tests/base/sys/socket.h: Update.
This commit is contained in:
Clément Chigot 2021-07-05 11:19:44 -04:00 committed by David Edelsohn
parent f65878178a
commit 03b634c8e0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fixincludes/fixincl.x
View File

@ -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 };
/* * * * * * * * * * * * * * * * * * * * * * * * * *

9
fixincludes/inclhack.def
View File

@ -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 = {

1
fixincludes/tests/base/sys/socket.h
View File

@ -13,6 +13,7 @@
#ifndef _KERNEL
#ifdef __cplusplus
extern "C++" {
extern "C" int naccept(int, struct sockaddr *, socklen_t *);
#endif /* AIX_EXTERNCPP1_CHECK */