diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-29 18:33:17 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-10-29 18:33:17 +0100 |
| commit | 4fcc9e988b0283ad438836098f30adf5cd4acb7c (patch) | |
| tree | 9d4e4b72638ccfb7059b4503622988e91a421447 /gl/unistd.in.h | |
| parent | 6cda033627007ac64f8a0643309c7e0d83aec893 (diff) | |
| download | gnutls-4fcc9e988b0283ad438836098f30adf5cd4acb7c.tar.gz | |
Updated gnulib
Diffstat (limited to 'gl/unistd.in.h')
| -rw-r--r-- | gl/unistd.in.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/gl/unistd.in.h b/gl/unistd.in.h index 675c7e6a55..0e510d679c 100644 --- a/gl/unistd.in.h +++ b/gl/unistd.in.h @@ -61,8 +61,10 @@ /* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>. */ /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */ +/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is + included here. */ /* But avoid namespace pollution on glibc systems. */ -#ifndef __GLIBC__ +#if !defined __GLIBC__ && !defined __osf__ # define __need_system_stdlib_h # include <stdlib.h> # undef __need_system_stdlib_h @@ -114,6 +116,9 @@ # include <getopt.h> #endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_UNISTD_INLINE # define _GL_UNISTD_INLINE _GL_INLINE @@ -649,10 +654,19 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - " #if @GNULIB_GETDTABLESIZE@ /* Return the maximum number of file descriptors in the current process. In POSIX, this is same as sysconf (_SC_OPEN_MAX). */ -# if !@HAVE_GETDTABLESIZE@ +# if @REPLACE_GETDTABLESIZE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getdtablesize +# define getdtablesize rpl_getdtablesize +# endif +_GL_FUNCDECL_RPL (getdtablesize, int, (void)); +_GL_CXXALIAS_RPL (getdtablesize, int, (void)); +# else +# if !@HAVE_GETDTABLESIZE@ _GL_FUNCDECL_SYS (getdtablesize, int, (void)); -# endif +# endif _GL_CXXALIAS_SYS (getdtablesize, int, (void)); +# endif _GL_CXXALIASWARN (getdtablesize); #elif defined GNULIB_POSIXCHECK # undef getdtablesize |