mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

c++: Another solaris header use [PR 98315]

Browse Source 
Rather than early-include sys/socket.h, let's allow the includer to
tell cody no networking.

	libcody/
	* cody.hh: Allow user to set CODY_NETWORKING.
	gcc/cp/
	* mapper-resolver.cc: Remove early include of
	sys/socket.h.  Specify no CODY_NETWORKING instead.
	* module.cc: Specify no CODY_NETWORKING.
This commit is contained in:
Nathan Sidwell 2020-12-16 11:53:27 -08:00
parent 8d8bb85b48
commit b7b6879f0b
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/mapper-resolver.cc
View File

@ -21,13 +21,9 @@ 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"
// We don't want or need to be aware of networking
#define CODY_NETWORKING 0
#include "../../c++tools/resolver.cc"

3
gcc/cp/module.cc
View File

@ -207,7 +207,6 @@ Classes used:
#define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
#include "cp-tree.h"
@ -229,6 +228,8 @@ Classes used:
#include "attribs.h"
#include "intl.h"
#include "langhooks.h"
/* This TU doesn't need or want to see the networking. */
#define CODY_NETWORKING 0
#include "mapper-client.h"
#if HAVE_MMAP_FILE && _POSIX_MAPPED_FILES > 0

4
libcody/cody.hh
View File

@ -5,6 +5,9 @@
#ifndef CODY_HH
#define CODY_HH 1
// If the user specifies this as non-zero, it must be what we expect,
// generally only good for requesting no networking
#if !defined (CODY_NETWORKING)
// Have a known-good list of networking systems
#if defined (__unix__) || defined (__MACH__)
#define CODY_NETWORKING 1
@ -15,6 +18,7 @@
#undef CODY_NETWORKING
#define CODY_NETWORKING 0
#endif
#endif
// C++
#include <memory>