projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mbslen: Avoid collision with system function.
[gnulib.git]
/
lib
/
sys_select.in.h
diff --git
a/lib/sys_select.in.h
b/lib/sys_select.in.h
index
1fb2d94
..
11e20f4
100644
(file)
--- a/
lib/sys_select.in.h
+++ b/
lib/sys_select.in.h
@@
-1,5
+1,5
@@
/* Substitute for <sys/select.h>.
/* Substitute for <sys/select.h>.
- Copyright (C) 2007-20
09
Free Software Foundation, Inc.
+ Copyright (C) 2007-20
10
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-42,12
+42,18
@@
# include <sys/types.h>
/* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
# include <sys/types.h>
/* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
- of 'struct timeval', and no definition of this type. */
-# include <sys/time.h>
+ of 'struct timeval', and no definition of this type.
+ But avoid namespace pollution on glibc systems. */
+# ifndef __GLIBC__
+# include <sys/time.h>
+# endif
/* On Solaris 10, <sys/select.h> provides an FD_ZERO implementation
/* On Solaris 10, <sys/select.h> provides an FD_ZERO implementation
- that relies on memset(), but without including <string.h>. */
-# include <string.h>
+ that relies on memset(), but without including <string.h>.
+ But avoid namespace pollution on glibc systems. */
+# ifndef __GLIBC__
+# include <string.h>
+# endif
/* The include_next requires a split double-inclusion guard. */
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
/* The include_next requires a split double-inclusion guard. */
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@