aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@acm.org>2020-12-16 09:38:53 -0800
committerNathan Sidwell <nathan@acm.org>2020-12-16 09:41:05 -0800
commit269e82d49e2d5bf26ab847fa0f29fba0ad6f326a (patch)
tree2758962715a783859dc72908270274e7be9a508b /gcc
parent652702b0c93644a44ad5bdfd4ff260d0f69a084b (diff)
downloadgcc-269e82d49e2d5bf26ab847fa0f29fba0ad6f326a.zip
gcc-269e82d49e2d5bf26ab847fa0f29fba0ad6f326a.tar.gz
gcc-269e82d49e2d5bf26ab847fa0f29fba0ad6f326a.tar.bz2
C++: Fix solaris header use (mk 2)
There is another path to get to a poisoned bcopy. Fixed thusly. gcc/cp/ * mapper-resolver.cc: #include sys/socket before system.h due to poisoned bcopy use.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/mapper-resolver.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/mapper-resolver.cc b/gcc/cp/mapper-resolver.cc
index 02ec48c..8e968c5 100644
--- a/gcc/cp/mapper-resolver.cc
+++ b/gcc/cp/mapper-resolver.cc
@@ -21,6 +21,12 @@ along with GCC; see the file COPYING3. If not see
/* Forward to the resolver in c++tools. */
#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
+
#define INCLUDE_ALGORITHM
#include "system.h"