diff options
| author | Joakim Verona | 2013-02-10 00:03:41 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-02-10 00:03:41 +0100 |
| commit | 33cc2cd4d53f845b7d1e681dbbe8166acdb652c3 (patch) | |
| tree | 551834731473d23116e08cb89facebbc8bad03db /lib/sys_select.in.h | |
| parent | 4df065db6acba3975884b435422773ab97f32a00 (diff) | |
| parent | eff1c1900f47ec5dfb6d435325b366362d09d2db (diff) | |
| download | emacs-33cc2cd4d53f845b7d1e681dbbe8166acdb652c3.tar.gz emacs-33cc2cd4d53f845b7d1e681dbbe8166acdb652c3.zip | |
auto upstream
Diffstat (limited to 'lib/sys_select.in.h')
| -rw-r--r-- | lib/sys_select.in.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index edff088a125..521ccef321d 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h | |||
| @@ -19,14 +19,25 @@ | |||
| 19 | # endif | 19 | # endif |
| 20 | @PRAGMA_COLUMNS@ | 20 | @PRAGMA_COLUMNS@ |
| 21 | 21 | ||
| 22 | /* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>. | 22 | /* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h> |
| 23 | both include <sys/select.h>. | ||
| 23 | Simply delegate to the system's header in this case. */ | 24 | Simply delegate to the system's header in this case. */ |
| 24 | #if @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TYPES_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) && defined _OSF_SOURCE | 25 | #if (@HAVE_SYS_SELECT_H@ \ |
| 26 | && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \ | ||
| 27 | || (defined __sun && defined _SYS_TYPES_H \ | ||
| 28 | && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ | ||
| 29 | || defined __EXTENSIONS__))) \ | ||
| 30 | && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) | ||
| 25 | 31 | ||
| 26 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H | 32 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H |
| 27 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ | 33 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ |
| 28 | 34 | ||
| 29 | #elif @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TIME_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) && defined _OSF_SOURCE | 35 | #elif (@HAVE_SYS_SELECT_H@ \ |
| 36 | && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \ | ||
| 37 | || (defined __sun && defined _SYS_TIME_H \ | ||
| 38 | && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ | ||
| 39 | || defined __EXTENSIONS__))) \ | ||
| 40 | && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) | ||
| 30 | 41 | ||
| 31 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H | 42 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H |
| 32 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ | 43 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ |