diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-07 10:57:11 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-07 10:57:11 -0800 |
| commit | 0d181095652bf8e1ca27935e54ecbb5443496334 (patch) | |
| tree | 5bf9307c53f29af1a493e42308887ce26785c5b3 /lib/stdint.in.h | |
| parent | d67d60a2eab5f7f1f9b1d31cd1c7dd1e31bb4d2b (diff) | |
| download | emacs-0d181095652bf8e1ca27935e54ecbb5443496334.tar.gz | |
Merge from gnulib.
This incorporates:
2014-03-04 stdint: fix missing SIZE_MAX on Android
2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
Update from gnulib.
Fix oversight preventing lib/sys/types.h from being generated.
* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
Diffstat (limited to 'lib/stdint.in.h')
| -rw-r--r-- | lib/stdint.in.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 5deca3969ab..247f0d89619 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -38,8 +38,7 @@ other system header files; just include the system's <stdint.h>. Ideally we should test __BIONIC__ here, but it is only defined after <sys/cdefs.h> has been included; hence test __ANDROID__ instead. */ -#if defined __ANDROID__ \ - && defined _SYS_TYPES_H_ && !defined __need_size_t +#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else |