projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
652702b
)
C++: Fix solaris header use (mk 2)
author
Nathan Sidwell
<nathan@acm.org>
Wed, 16 Dec 2020 17:38:53 +0000
(09:38 -0800)
committer
Nathan Sidwell
<nathan@acm.org>
Wed, 16 Dec 2020 17:41:05 +0000
(09:41 -0800)
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.
gcc/cp/mapper-resolver.cc
patch
|
blob
|
history
diff --git
a/gcc/cp/mapper-resolver.cc
b/gcc/cp/mapper-resolver.cc
index 02ec48c61eabdc07e2309f3c912df2aea1d498ab..8e968c5255613af159035d2b3ded522dd74d19ae 100644
(file)
--- 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"