diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lib/sys_select.in.h | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lib/sys_select.in.h')
| -rw-r--r-- | lib/sys_select.in.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 521ccef321d..2af6bfe6f6f 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h | |||
| @@ -21,23 +21,27 @@ | |||
| 21 | 21 | ||
| 22 | /* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h> | 22 | /* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h> |
| 23 | both include <sys/select.h>. | 23 | both include <sys/select.h>. |
| 24 | On Cygwin, <sys/time.h> includes <sys/select.h>. | ||
| 24 | Simply delegate to the system's header in this case. */ | 25 | Simply delegate to the system's header in this case. */ |
| 25 | #if (@HAVE_SYS_SELECT_H@ \ | 26 | #if (@HAVE_SYS_SELECT_H@ \ |
| 26 | && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \ | 27 | && ((defined __osf__ && defined _SYS_TYPES_H_ \ |
| 28 | && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ | ||
| 29 | && defined _OSF_SOURCE) \ | ||
| 27 | || (defined __sun && defined _SYS_TYPES_H \ | 30 | || (defined __sun && defined _SYS_TYPES_H \ |
| 28 | && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ | 31 | && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ |
| 29 | || defined __EXTENSIONS__))) \ | 32 | || defined __EXTENSIONS__)))) |
| 30 | && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) | ||
| 31 | 33 | ||
| 32 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H | 34 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H |
| 33 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ | 35 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ |
| 34 | 36 | ||
| 35 | #elif (@HAVE_SYS_SELECT_H@ \ | 37 | #elif (@HAVE_SYS_SELECT_H@ \ |
| 36 | && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \ | 38 | && (defined _CYGWIN_SYS_TIME_H \ |
| 39 | || (defined __osf__ && defined _SYS_TIME_H_ \ | ||
| 40 | && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ | ||
| 41 | && defined _OSF_SOURCE) \ | ||
| 37 | || (defined __sun && defined _SYS_TIME_H \ | 42 | || (defined __sun && defined _SYS_TIME_H \ |
| 38 | && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ | 43 | && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ |
| 39 | || defined __EXTENSIONS__))) \ | 44 | || defined __EXTENSIONS__)))) |
| 40 | && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) | ||
| 41 | 45 | ||
| 42 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H | 46 | # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H |
| 43 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ | 47 | # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ |