Mercurial > hg > octave-lyh > gnulib-hg
changeset 10882:3c51cf16c4fa
Fix compilation error on OSF/1 4.0.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 15 Dec 2008 13:39:49 +0100 |
parents | da79e105bf30 |
children | e578654f58d3 |
files | ChangeLog lib/sys_select.in.h |
diffstat | 2 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-12-15 Bruno Haible <bruno@clisp.org> + + Fix compilation error on OSF/1 4.0. + * lib/sys_select.in.h: When invoked from OSF/1 <sys/types.h> or + <sys/time.h>, simply delegate to the system header. + Reported by Daniel Richard G. <oss@teragram.com>. + 2008-12-15 Bruno Haible <bruno@clisp.org> * doc/posix-functions/openat.texi: Mention the 'openat' module.
--- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -15,14 +15,28 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +# if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +# endif + +/* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>. + Simply delegate to the system's header in this case. */ +#if @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TYPES_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) && defined _OSF_SOURCE + +# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H +# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ + +#elif @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TIME_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) && defined _OSF_SOURCE + +# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H +# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ + +#else + #ifndef _GL_SYS_SELECT_H #if @HAVE_SYS_SELECT_H@ -# if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -# endif - /* On many platforms, <sys/select.h> assumes prior inclusion of <sys/types.h>. */ # include <sys/types.h> @@ -76,3 +90,4 @@ #endif /* _GL_SYS_SELECT_H */ #endif /* _GL_SYS_SELECT_H */ +#endif /* OSF/1 */