diff options
| author | David Edelsohn <dje.gcc@gmail.com> | 2020-09-16 18:56:00 +0000 |
|---|---|---|
| committer | David Edelsohn <dje.gcc@gmail.com> | 2020-09-17 14:18:32 +0000 |
| commit | 21fdebc519578aad72c8550b05c05813c5b28c21 (patch) | |
| tree | 83333f5e15a717362e6226aa6a1d1a0f0b6f190d /fixincludes/tests | |
| parent | b28b621ac67beee81a47adb50b954bcf751570fd (diff) | |
| download | gcc-21fdebc519578aad72c8550b05c05813c5b28c21.zip gcc-21fdebc519578aad72c8550b05c05813c5b28c21.tar.gz gcc-21fdebc519578aad72c8550b05c05813c5b28c21.tar.bz2 | |
aix: apply socket.h extern "C++" more narrowly.
Recent Technology Levels of AIX 7.2 have made sys/socket.h more C++-aware,
which causes the fix to be applied in too many locations. This patch adds
more context for the selection to apply the fix more narrowly.
fixincludes/ChangeLog:
2020-09-17 David Edelsohn <dje.gcc@gmail.com>
* inclhack.def (aix_externcpp1): Add more context to select.
(aix_externcpp2): Same.
* fixincl.x: Regenerate.
* tests/base/sys/socket.h: Update expected results.
Diffstat (limited to 'fixincludes/tests')
| -rw-r--r-- | fixincludes/tests/base/sys/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fixincludes/tests/base/sys/socket.h b/fixincludes/tests/base/sys/socket.h index 5d66f8b..c1e2b42 100644 --- a/fixincludes/tests/base/sys/socket.h +++ b/fixincludes/tests/base/sys/socket.h @@ -10,12 +10,14 @@ #if defined( AIX_EXTERNCPP1_CHECK ) +#ifndef _KERNEL #ifdef __cplusplus extern "C++" { #endif /* AIX_EXTERNCPP1_CHECK */ #if defined( AIX_EXTERNCPP2_CHECK ) +#endif /* COMPAT_43 */ } /* extern "C++" */ #else /* __cplusplus */ #endif /* AIX_EXTERNCPP2_CHECK */ |