public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-8707] fixincludes: AIX socket.h.
@ 2021-07-08 19:50 David Edelsohn
0 siblings, 0 replies; only message in thread
From: David Edelsohn @ 2021-07-08 19:50 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:9f4e879cbcd8ff4bffcfb119c821bd4f1b7392fa
commit r11-8707-g9f4e879cbcd8ff4bffcfb119c821bd4f1b7392fa
Author: Clément Chigot <clement.chigot@atos.net>
Date: Mon Jul 5 11:19:44 2021 -0400
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.
(cherry picked from commit 03b634c8e0d3e8628ced79fc4f40873e12a3039c)
Diff:
---
fixincludes/fixincl.x | 10 ++++++----
fixincludes/inclhack.def | 9 ++++++---
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 cc17edfba0b..6c50e972165 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 3a4cfe06542..066bef99162 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 c1e2b425be1..588a378fe0a 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 */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-08 19:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-08 19:50 [gcc r11-8707] fixincludes: AIX socket.h David Edelsohn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).