diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-03-04 15:17:23 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-03-04 15:17:23 +0100 |
| commit | e3b1519809de90067e0058b0a43e3817de134f72 (patch) | |
| tree | e2bf51ae0b0105b35be2962c7ae50fb803bdcb54 /lib/gllib | |
| parent | f410d3a7c70b75b65fcec74542e0cf7d8817d81c (diff) | |
| download | libtasn1-e3b1519809de90067e0058b0a43e3817de134f72.tar.gz libtasn1-e3b1519809de90067e0058b0a43e3817de134f72.tar.bz2 libtasn1-e3b1519809de90067e0058b0a43e3817de134f72.zip | |
Update gnulib files.
Diffstat (limited to 'lib/gllib')
| -rw-r--r-- | lib/gllib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/gllib/stdint.in.h | 4 | ||||
| -rw-r--r-- | lib/gllib/wchar.in.h | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/gllib/Makefile.am b/lib/gllib/Makefile.am index 83449ff..04f4712 100644 --- a/lib/gllib/Makefile.am +++ b/lib/gllib/Makefile.am @@ -27,6 +27,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = AM_CPPFLAGS = +AM_CFLAGS = noinst_LTLIBRARIES += libgnu.la diff --git a/lib/gllib/stdint.in.h b/lib/gllib/stdint.in.h index 7cbfc2c..e7a3be5 100644 --- a/lib/gllib/stdint.in.h +++ b/lib/gllib/stdint.in.h @@ -435,7 +435,7 @@ typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - #undef PTRDIFF_MIN #undef PTRDIFF_MAX #if @APPLE_UNIVERSAL_BUILD@ -# if _LP64 +# ifdef _LP64 # define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) # define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) # else @@ -463,7 +463,7 @@ typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - /* size_t limit */ #undef SIZE_MAX #if @APPLE_UNIVERSAL_BUILD@ -# if _LP64 +# ifdef _LP64 # define SIZE_MAX _STDINT_MAX (0, 64, 0ul) # else # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) diff --git a/lib/gllib/wchar.in.h b/lib/gllib/wchar.in.h index cd46ff1..89d6036 100644 --- a/lib/gllib/wchar.in.h +++ b/lib/gllib/wchar.in.h @@ -30,7 +30,7 @@ @PRAGMA_SYSTEM_HEADER@ #endif -#if defined __need_mbstate_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) +#if defined __need_mbstate_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H /* Special invocation convention: - Inside uClibc header files. - On HP-UX 11.00 we have a sequence of nested includes @@ -38,7 +38,10 @@ once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h> and once directly. In both situations 'wint_t' is not yet defined, therefore we cannot provide the function overrides; instead include only - the system's <wchar.h>. */ + the system's <wchar.h>. + - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and + the latter includes <wchar.h>. But here, we have no way to detect whether + <wctype.h> is completely included or is still being included. */ #@INCLUDE_NEXT@ @NEXT_WCHAR_H@ @@ -47,6 +50,8 @@ #ifndef _GL_WCHAR_H +#define _GL_ALREADY_INCLUDING_WCHAR_H + /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before <wchar.h>. BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be @@ -62,6 +67,8 @@ # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ #endif +#undef _GL_ALREADY_INCLUDING_WCHAR_H + #ifndef _GL_WCHAR_H #define _GL_WCHAR_H |