From: Nathan Sidwell <nathan@acm.org>
Date: Wed, 16 Dec 2020 17:38:53 +0000 (-0800)
Subject: C++: Fix solaris header use (mk 2)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=269e82d49e2d5bf26ab847fa0f29fba0ad6f326a;p=gcc.git

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.
---

diff --git a/gcc/cp/mapper-resolver.cc b/gcc/cp/mapper-resolver.cc
index 02ec48c61ea..8e968c52556 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"