diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-12-16 05:10:16 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-12-16 05:18:39 -0800 |
| commit | 6ff747f023cb4e6289a48dca608ef150e7410b00 (patch) | |
| tree | de2b73b4f7b8ddcbe39918212dfcd65845645718 /gcc | |
| parent | 1c4aefb6818bf0850a3c3263e66fbf9673f069fd (diff) | |
| download | gcc-6ff747f023cb4e6289a48dca608ef150e7410b00.zip gcc-6ff747f023cb4e6289a48dca608ef150e7410b00.tar.gz gcc-6ff747f023cb4e6289a48dca608ef150e7410b00.tar.bz2 | |
c++: Fix (some) solaris breakage
Solaris' sys/socket uses the poisoned bcopy identifier, so we must
preemptively copy a bit of cody's inclusion logic to get it earlier.
gcc/cp/
* mapper-client.cc: Include sys/socket.h before system.h.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/mapper-client.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/mapper-client.cc b/gcc/cp/mapper-client.cc index acec591..2ad770b 100644 --- a/gcc/cp/mapper-client.cc +++ b/gcc/cp/mapper-client.cc @@ -19,6 +19,11 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ #include "config.h" +#if defined (__unix__) +// Solaris11's socket header used bcopy, which we poison. cody.hh +// will include it later under the above check +#include <sys/socket.h> +#endif #include "system.h" #include "line-map.h" @@ -28,6 +33,10 @@ along with GCC; see the file COPYING3. If not see #include "../../c++tools/resolver.h" +#if !HOST_HAS_O_CLOEXEC +#define O_CLOEXEC 0 +#endif + module_client::module_client (pex_obj *p, int fd_from, int fd_to) : Client (fd_from, fd_to), pex (p) { |