gdb/
Import gnulib module inttypes from git (250b80067c1e1d8faa0c42fb572f721975b929c5) * Makefile.in (HFILES_NO_SRCDIR): Add gnulib/inttypes.in.h. (aclocal_m4_deps): Add gnulib/m4/inttypes.m4 and gnulib/m4/inttypes-pri.m4 * aclocal.m4, config.in, configure: Regenerated. * gnulib/Makefile.am: Update. * gnulib/Makefile.in: Update. * gnulib/m4/gnulib-cache.m4: Update. * gnulib/m4/gnulib-comp.m4: Update. * gnulib/inttypes.in.h: New. * gnulib/m4/inttypes-pri.m4: New. * gnulib/m4/inttypes.m4: New. gdb/gdbserver/ Import gnulib module inttypes. * aclocal.m4, config.in, configure: Regenerated.
This commit is contained in:
parent
dc750257de
commit
55a8c0761d
|
@ -1,3 +1,18 @@
|
|||
2012-04-14 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
Import gnulib module inttypes from git
|
||||
(250b80067c1e1d8faa0c42fb572f721975b929c5)
|
||||
* Makefile.in (HFILES_NO_SRCDIR): Add gnulib/inttypes.in.h.
|
||||
(aclocal_m4_deps): Add gnulib/m4/inttypes.m4 and gnulib/m4/inttypes-pri.m4
|
||||
* aclocal.m4, config.in, configure: Regenerated.
|
||||
* gnulib/Makefile.am: Update.
|
||||
* gnulib/Makefile.in: Update.
|
||||
* gnulib/m4/gnulib-cache.m4: Update.
|
||||
* gnulib/m4/gnulib-comp.m4: Update.
|
||||
* gnulib/inttypes.in.h: New.
|
||||
* gnulib/m4/inttypes-pri.m4: New.
|
||||
* gnulib/m4/inttypes.m4: New.
|
||||
|
||||
2012-04-13 Luis Machado <lgustavo@codesourcery.com>
|
||||
|
||||
* infrun.c (resume): Update PC address to the real PC after
|
||||
|
|
|
@ -821,7 +821,7 @@ osdata.h procfs.h python/py-event.h python/py-events.h python/py-stopevent.h \
|
|||
python/python-internal.h python/python.h ravenscar-thread.h record.h \
|
||||
solib-darwin.h solib-ia64-hpux.h solib-spu.h windows-nat.h xcoffread.h \
|
||||
gnulib/extra/arg-nonnull.h gnulib/extra/c++defs.h gnulib/extra/warn-on-use.h \
|
||||
gnulib/stddef.in.h inline-frame.h skip.h \
|
||||
gnulib/stddef.in.h gnulib/inttypes.in.h inline-frame.h skip.h \
|
||||
common/common-utils.h common/xml-utils.h common/buffer.h common/ptid.h \
|
||||
common/linux-osdata.h gdb-dlfcn.h
|
||||
|
||||
|
@ -1312,6 +1312,8 @@ aclocal_m4_deps = \
|
|||
gnulib/m4/gnulib-comp.m4 \
|
||||
gnulib/m4/gnulib-tool.m4 \
|
||||
gnulib/m4/include_next.m4 \
|
||||
gnulib/m4/inttypes.m4 \
|
||||
gnulib/m4/inttypes-pri.m4 \
|
||||
gnulib/m4/longlong.m4 \
|
||||
gnulib/m4/memchr.m4 \
|
||||
gnulib/m4/memmem.m4 \
|
||||
|
|
|
@ -976,6 +976,8 @@ m4_include([gnulib/m4/extensions.m4])
|
|||
m4_include([gnulib/m4/gnulib-common.m4])
|
||||
m4_include([gnulib/m4/gnulib-comp.m4])
|
||||
m4_include([gnulib/m4/include_next.m4])
|
||||
m4_include([gnulib/m4/inttypes-pri.m4])
|
||||
m4_include([gnulib/m4/inttypes.m4])
|
||||
m4_include([gnulib/m4/longlong.m4])
|
||||
m4_include([gnulib/m4/memchr.m4])
|
||||
m4_include([gnulib/m4/memmem.m4])
|
||||
|
|
|
@ -78,6 +78,9 @@
|
|||
/* Define to the default OS ABI for this configuration. */
|
||||
#undef GDB_OSABI_DEFAULT
|
||||
|
||||
/* Define to make the limit macros in <stdint.h> visible. */
|
||||
#undef GL_TRIGGER_STDC_LIMIT_MACROS
|
||||
|
||||
/* Define to 1 when the gnulib module memchr should be tested. */
|
||||
#undef GNULIB_TEST_MEMCHR
|
||||
|
||||
|
@ -125,6 +128,14 @@
|
|||
don't. */
|
||||
#undef HAVE_DECL_GETTHRDS
|
||||
|
||||
/* Define to 1 if you have the declaration of `imaxabs', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_IMAXABS
|
||||
|
||||
/* Define to 1 if you have the declaration of `imaxdiv', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_IMAXDIV
|
||||
|
||||
/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
|
||||
*/
|
||||
#undef HAVE_DECL_MALLOC
|
||||
|
@ -153,6 +164,14 @@
|
|||
*/
|
||||
#undef HAVE_DECL_STRSTR
|
||||
|
||||
/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_STRTOIMAX
|
||||
|
||||
/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_STRTOUMAX
|
||||
|
||||
/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_VSNPRINTF
|
||||
|
@ -387,6 +406,12 @@
|
|||
/* Define to 1 if btowc is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_BTOWC
|
||||
|
||||
/* Define to 1 if imaxabs is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_IMAXABS
|
||||
|
||||
/* Define to 1 if imaxdiv is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_IMAXDIV
|
||||
|
||||
/* Define to 1 if mbrlen is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_MBRLEN
|
||||
|
||||
|
@ -447,9 +472,15 @@
|
|||
/* Define to 1 if strsignal is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRSIGNAL
|
||||
|
||||
/* Define to 1 if strtoimax is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRTOIMAX
|
||||
|
||||
/* Define to 1 if strtok_r is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRTOK_R
|
||||
|
||||
/* Define to 1 if strtoumax is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRTOUMAX
|
||||
|
||||
/* Define to 1 if strverscmp is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRVERSCMP
|
||||
|
||||
|
@ -793,6 +824,9 @@
|
|||
/* Define to 1 if the "%ll" format works to print long longs. */
|
||||
#undef PRINTF_HAS_LONG_LONG
|
||||
|
||||
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
|
||||
#undef PRI_MACROS_BROKEN
|
||||
|
||||
/* Define if <proc_service.h> on solaris uses int instead of size_t, and
|
||||
assorted other type changes. */
|
||||
#undef PROC_SERVICE_IS_OLD
|
||||
|
@ -971,6 +1005,13 @@
|
|||
#endif
|
||||
|
||||
|
||||
/* Ensure that <stdint.h> defines the limit macros, since gnulib's
|
||||
<inttypes.h> relies on them. */
|
||||
#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
|
||||
# define __STDC_LIMIT_MACROS 1
|
||||
#endif
|
||||
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
#undef const
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,3 +1,8 @@
|
|||
2012-04-14 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
Import gnulib module inttypes.
|
||||
* aclocal.m4, config.in, configure: Regenerated.
|
||||
|
||||
2012-04-14 Yao Qi <yao@codesourcery.com>
|
||||
|
||||
* Makefile.in (maintainer-clean, realclean, distclean): Remove
|
||||
|
|
|
@ -994,6 +994,8 @@ m4_include([../gnulib/m4/extensions.m4])
|
|||
m4_include([../gnulib/m4/gnulib-common.m4])
|
||||
m4_include([../gnulib/m4/gnulib-comp.m4])
|
||||
m4_include([../gnulib/m4/include_next.m4])
|
||||
m4_include([../gnulib/m4/inttypes-pri.m4])
|
||||
m4_include([../gnulib/m4/inttypes.m4])
|
||||
m4_include([../gnulib/m4/longlong.m4])
|
||||
m4_include([../gnulib/m4/memchr.m4])
|
||||
m4_include([../gnulib/m4/memmem.m4])
|
||||
|
|
|
@ -27,6 +27,9 @@
|
|||
/* Define to 1 if using `alloca.c'. */
|
||||
#undef C_ALLOCA
|
||||
|
||||
/* Define to make the limit macros in <stdint.h> visible. */
|
||||
#undef GL_TRIGGER_STDC_LIMIT_MACROS
|
||||
|
||||
/* Define to 1 when the gnulib module memchr should be tested. */
|
||||
#undef GNULIB_TEST_MEMCHR
|
||||
|
||||
|
@ -50,6 +53,14 @@
|
|||
you don't. */
|
||||
#undef HAVE_DECL_ADDR_NO_RANDOMIZE
|
||||
|
||||
/* Define to 1 if you have the declaration of `imaxabs', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_IMAXABS
|
||||
|
||||
/* Define to 1 if you have the declaration of `imaxdiv', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_IMAXDIV
|
||||
|
||||
/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't.
|
||||
*/
|
||||
#undef HAVE_DECL_MEMMEM
|
||||
|
@ -62,6 +73,14 @@
|
|||
don't. */
|
||||
#undef HAVE_DECL_STRERROR
|
||||
|
||||
/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_STRTOIMAX
|
||||
|
||||
/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_STRTOUMAX
|
||||
|
||||
/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_VASPRINTF
|
||||
|
@ -178,6 +197,12 @@
|
|||
/* Define to 1 if btowc is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_BTOWC
|
||||
|
||||
/* Define to 1 if imaxabs is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_IMAXABS
|
||||
|
||||
/* Define to 1 if imaxdiv is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_IMAXDIV
|
||||
|
||||
/* Define to 1 if mbrlen is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_MBRLEN
|
||||
|
||||
|
@ -238,9 +263,15 @@
|
|||
/* Define to 1 if strsignal is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRSIGNAL
|
||||
|
||||
/* Define to 1 if strtoimax is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRTOIMAX
|
||||
|
||||
/* Define to 1 if strtok_r is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRTOK_R
|
||||
|
||||
/* Define to 1 if strtoumax is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRTOUMAX
|
||||
|
||||
/* Define to 1 if strverscmp is declared even after undefining macros. */
|
||||
#undef HAVE_RAW_DECL_STRVERSCMP
|
||||
|
||||
|
@ -405,6 +436,9 @@
|
|||
/* Additional package description */
|
||||
#undef PKGVERSION
|
||||
|
||||
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
|
||||
#undef PRI_MACROS_BROKEN
|
||||
|
||||
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
|
||||
'ptrdiff_t'. */
|
||||
#undef PTRDIFF_T_SUFFIX
|
||||
|
@ -485,6 +519,13 @@
|
|||
#endif
|
||||
|
||||
|
||||
/* Ensure that <stdint.h> defines the limit macros, since gnulib's
|
||||
<inttypes.h> relies on them. */
|
||||
#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
|
||||
# define __STDC_LIMIT_MACROS 1
|
||||
#endif
|
||||
|
||||
|
||||
/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
|
||||
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
|
||||
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -9,7 +9,7 @@
|
|||
# the same distribution terms as the rest of that program.
|
||||
#
|
||||
# Generated by gnulib-tool.
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files memmem
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.5 gnits
|
||||
|
||||
|
@ -85,6 +85,47 @@ EXTRA_DIST += $(top_srcdir)/gnulib/extra/c++defs.h
|
|||
|
||||
## end gnulib module c++defs
|
||||
|
||||
## begin gnulib module inttypes
|
||||
|
||||
BUILT_SOURCES += inttypes.h
|
||||
|
||||
# We need the following in order to create <inttypes.h> when the system
|
||||
# doesn't have one that works with the given compiler.
|
||||
inttypes.h: inttypes.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
|
||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
|
||||
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
|
||||
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
|
||||
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
|
||||
-e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
|
||||
-e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
|
||||
-e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
|
||||
-e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
|
||||
-e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
|
||||
-e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
|
||||
-e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
|
||||
-e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
|
||||
-e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
|
||||
-e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
|
||||
-e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
|
||||
-e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
|
||||
-e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
|
||||
-e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
|
||||
-e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
|
||||
-e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
|
||||
-e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
|
||||
-e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
|
||||
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
|
||||
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
|
||||
< $(srcdir)/inttypes.in.h; \
|
||||
} > $@-t && \
|
||||
mv $@-t $@
|
||||
MOSTLYCLEANFILES += inttypes.h inttypes.h-t
|
||||
|
||||
EXTRA_DIST += inttypes.in.h
|
||||
|
||||
## end gnulib module inttypes
|
||||
|
||||
## begin gnulib module memchr
|
||||
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
# the same distribution terms as the rest of that program.
|
||||
#
|
||||
# Generated by gnulib-tool.
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files memmem
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem
|
||||
|
||||
|
||||
|
||||
|
@ -51,11 +51,16 @@ subdir = gnulib
|
|||
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/largefile.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/plugins.m4 \
|
||||
$(top_srcdir)/gnulib/m4/00gnulib.m4 \
|
||||
$(top_srcdir)/gnulib/m4/extensions.m4 \
|
||||
$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
|
||||
$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
|
||||
$(top_srcdir)/gnulib/m4/include_next.m4 \
|
||||
$(top_srcdir)/gnulib/m4/inttypes-pri.m4 \
|
||||
$(top_srcdir)/gnulib/m4/inttypes.m4 \
|
||||
$(top_srcdir)/gnulib/m4/longlong.m4 \
|
||||
$(top_srcdir)/gnulib/m4/memchr.m4 \
|
||||
$(top_srcdir)/gnulib/m4/memmem.m4 \
|
||||
|
@ -68,10 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
|
|||
$(top_srcdir)/gnulib/m4/warn-on-use.m4 \
|
||||
$(top_srcdir)/gnulib/m4/wchar_h.m4 \
|
||||
$(top_srcdir)/gnulib/m4/wchar_t.m4 \
|
||||
$(top_srcdir)/gnulib/m4/wint_t.m4 \
|
||||
$(top_srcdir)/../config/largefile.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/plugins.m4 $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/gnulib/m4/wint_t.m4 $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/../bfd/bfd.m4 \
|
||||
$(top_srcdir)/../config/acinclude.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
|
@ -198,6 +200,8 @@ GDB_NM_FILE = @GDB_NM_FILE@
|
|||
GENCAT = @GENCAT@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GNULIB_BTOWC = @GNULIB_BTOWC@
|
||||
GNULIB_IMAXABS = @GNULIB_IMAXABS@
|
||||
GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
|
||||
GNULIB_MBRLEN = @GNULIB_MBRLEN@
|
||||
GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
|
||||
GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
|
||||
|
@ -236,7 +240,9 @@ GNULIB_STRPBRK = @GNULIB_STRPBRK@
|
|||
GNULIB_STRSEP = @GNULIB_STRSEP@
|
||||
GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
|
||||
GNULIB_STRSTR = @GNULIB_STRSTR@
|
||||
GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
|
||||
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
|
||||
GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
|
||||
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
|
||||
GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
|
||||
GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
|
||||
|
@ -246,13 +252,17 @@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
|
|||
GREP = @GREP@
|
||||
GUI_CFLAGS_X = @GUI_CFLAGS_X@
|
||||
HAVE_BTOWC = @HAVE_BTOWC@
|
||||
HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
|
||||
HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
|
||||
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
|
||||
HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
|
||||
HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
|
||||
HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
|
||||
HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
|
||||
HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
|
||||
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
|
||||
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
|
||||
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
|
||||
HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
|
||||
HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
|
||||
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
|
||||
|
@ -297,6 +307,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
INSTOBJEXT = @INSTOBJEXT@
|
||||
INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
|
||||
INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
|
||||
JIT_READER_DIR = @JIT_READER_DIR@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBEXPAT = @LIBEXPAT@
|
||||
LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
|
||||
|
@ -312,12 +325,16 @@ LTLIBOBJS = @LTLIBOBJS@
|
|||
MAINT = @MAINT@
|
||||
MAKE = @MAKE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKEINFOFLAGS = @MAKEINFOFLAGS@
|
||||
MAKEINFO_EXTRA_FLAGS = @MAKEINFO_EXTRA_FLAGS@
|
||||
MIG = @MIG@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
|
||||
NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
|
||||
NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
|
||||
NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
|
||||
NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
|
||||
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
|
||||
NEXT_STDDEF_H = @NEXT_STDDEF_H@
|
||||
NEXT_STDINT_H = @NEXT_STDINT_H@
|
||||
NEXT_STRING_H = @NEXT_STRING_H@
|
||||
|
@ -334,13 +351,19 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
|||
PKGVERSION = @PKGVERSION@
|
||||
POSUB = @POSUB@
|
||||
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
|
||||
PRIPTR_PREFIX = @PRIPTR_PREFIX@
|
||||
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
|
||||
PROFILE_CFLAGS = @PROFILE_CFLAGS@
|
||||
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
|
||||
PYTHON_CFLAGS = @PYTHON_CFLAGS@
|
||||
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||
PYTHON_LIBS = @PYTHON_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
RDYNAMIC = @RDYNAMIC@
|
||||
READLINE = @READLINE@
|
||||
READLINE_CFLAGS = @READLINE_CFLAGS@
|
||||
READLINE_DEPS = @READLINE_DEPS@
|
||||
READLINE_TEXI_INCFLAG = @READLINE_TEXI_INCFLAG@
|
||||
REPLACE_BTOWC = @REPLACE_BTOWC@
|
||||
REPLACE_MBRLEN = @REPLACE_MBRLEN@
|
||||
REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
|
||||
|
@ -380,8 +403,8 @@ STDINT_H = @STDINT_H@
|
|||
STRIP = @STRIP@
|
||||
SYSTEM_GDBINIT = @SYSTEM_GDBINIT@
|
||||
TARGET_OBS = @TARGET_OBS@
|
||||
TARGET_PTR = @TARGET_PTR@
|
||||
TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
|
||||
TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
|
||||
TCL_BIN_DIR = @TCL_BIN_DIR@
|
||||
TCL_DEPS = @TCL_DEPS@
|
||||
TCL_INCLUDE = @TCL_INCLUDE@
|
||||
|
@ -408,6 +431,8 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
|
|||
TK_STUB_LIB_SPEC = @TK_STUB_LIB_SPEC@
|
||||
TK_VERSION = @TK_VERSION@
|
||||
TK_XINCLUDES = @TK_XINCLUDES@
|
||||
UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
|
||||
UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
|
||||
UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
|
@ -473,6 +498,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
python_prog_path = @python_prog_path@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
@ -494,9 +520,10 @@ noinst_LIBRARIES = libgnu.a
|
|||
noinst_LTLIBRARIES =
|
||||
EXTRA_DIST = m4/gnulib-cache.m4 \
|
||||
$(top_srcdir)/gnulib/extra/arg-nonnull.h \
|
||||
$(top_srcdir)/gnulib/extra/c++defs.h memchr.c memchr.valgrind \
|
||||
memmem.c str-two-way.h stddef.in.h stdint.in.h string.in.h \
|
||||
$(top_srcdir)/gnulib/extra/warn-on-use.h wchar.in.h
|
||||
$(top_srcdir)/gnulib/extra/c++defs.h inttypes.in.h memchr.c \
|
||||
memchr.valgrind memmem.c str-two-way.h stddef.in.h stdint.in.h \
|
||||
string.in.h $(top_srcdir)/gnulib/extra/warn-on-use.h \
|
||||
wchar.in.h
|
||||
|
||||
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
|
||||
# statements but through direct file reference. Therefore this snippet must be
|
||||
|
@ -507,13 +534,13 @@ EXTRA_DIST = m4/gnulib-cache.m4 \
|
|||
# statements but through direct file reference. Therefore this snippet must be
|
||||
# present in all Makefile.am that need it. This is ensured by the applicability
|
||||
# 'all' defined above.
|
||||
BUILT_SOURCES = arg-nonnull.h c++defs.h $(STDDEF_H) $(STDINT_H) \
|
||||
string.h warn-on-use.h wchar.h
|
||||
BUILT_SOURCES = arg-nonnull.h c++defs.h inttypes.h $(STDDEF_H) \
|
||||
$(STDINT_H) string.h warn-on-use.h wchar.h
|
||||
SUFFIXES =
|
||||
MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
|
||||
c++defs.h c++defs.h-t stddef.h stddef.h-t stdint.h stdint.h-t \
|
||||
string.h string.h-t warn-on-use.h warn-on-use.h-t wchar.h \
|
||||
wchar.h-t
|
||||
c++defs.h c++defs.h-t inttypes.h inttypes.h-t stddef.h \
|
||||
stddef.h-t stdint.h stdint.h-t string.h string.h-t \
|
||||
warn-on-use.h warn-on-use.h-t wchar.h wchar.h-t
|
||||
MOSTLYCLEANDIRS =
|
||||
CLEANFILES =
|
||||
DISTCLEANFILES =
|
||||
|
@ -610,7 +637,7 @@ distclean-compile:
|
|||
# (which will cause the Makefiles to be regenerated when you run `make');
|
||||
# (2) otherwise, pass the desired values on the `make' command line.
|
||||
$(RECURSIVE_TARGETS):
|
||||
@failcom='exit 1'; \
|
||||
@fail= failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
|
@ -635,7 +662,7 @@ $(RECURSIVE_TARGETS):
|
|||
fi; test -z "$$fail"
|
||||
|
||||
$(RECURSIVE_CLEAN_TARGETS):
|
||||
@failcom='exit 1'; \
|
||||
@fail= failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
|
@ -940,6 +967,38 @@ c++defs.h: $(top_srcdir)/gnulib/extra/c++defs.h
|
|||
> $@-t && \
|
||||
mv $@-t $@
|
||||
|
||||
# We need the following in order to create <inttypes.h> when the system
|
||||
# doesn't have one that works with the given compiler.
|
||||
inttypes.h: inttypes.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
|
||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
|
||||
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
|
||||
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
|
||||
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
|
||||
-e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \
|
||||
-e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
|
||||
-e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
|
||||
-e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
|
||||
-e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
|
||||
-e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \
|
||||
-e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \
|
||||
-e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \
|
||||
-e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \
|
||||
-e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \
|
||||
-e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \
|
||||
-e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
|
||||
-e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
|
||||
-e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
|
||||
-e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
|
||||
-e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
|
||||
-e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
|
||||
-e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
|
||||
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
|
||||
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
|
||||
< $(srcdir)/inttypes.in.h; \
|
||||
} > $@-t && \
|
||||
mv $@-t $@
|
||||
|
||||
# We need the following in order to create <stddef.h> when the system
|
||||
# doesn't have one that works with the given compiler.
|
||||
stddef.h: stddef.in.h
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -15,11 +15,12 @@
|
|||
|
||||
|
||||
# Specification in the form of a command-line invocation:
|
||||
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files memmem
|
||||
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem
|
||||
|
||||
# Specification in the form of a few gnulib-tool.m4 macro invocations:
|
||||
gl_LOCAL_DIR([])
|
||||
gl_MODULES([
|
||||
inttypes
|
||||
memmem
|
||||
])
|
||||
gl_AVOID([])
|
||||
|
|
|
@ -30,6 +30,7 @@ AC_DEFUN([gl_EARLY],
|
|||
# Code from module extensions:
|
||||
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
|
||||
# Code from module include_next:
|
||||
# Code from module inttypes:
|
||||
# Code from module memchr:
|
||||
# Code from module memmem:
|
||||
# Code from module memmem-simple:
|
||||
|
@ -61,6 +62,8 @@ AC_DEFUN([gl_INIT],
|
|||
# Code from module c++defs:
|
||||
# Code from module extensions:
|
||||
# Code from module include_next:
|
||||
# Code from module inttypes:
|
||||
gl_INTTYPES_H
|
||||
# Code from module memchr:
|
||||
gl_FUNC_MEMCHR
|
||||
gl_STRING_MODULE_INDICATOR([memchr])
|
||||
|
@ -225,6 +228,7 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
build-aux/c++defs.h
|
||||
build-aux/warn-on-use.h
|
||||
lib/dummy.c
|
||||
lib/inttypes.in.h
|
||||
lib/memchr.c
|
||||
lib/memchr.valgrind
|
||||
lib/memmem.c
|
||||
|
@ -237,6 +241,8 @@ AC_DEFUN([gl_FILE_LIST], [
|
|||
m4/extensions.m4
|
||||
m4/gnulib-common.m4
|
||||
m4/include_next.m4
|
||||
m4/inttypes-pri.m4
|
||||
m4/inttypes.m4
|
||||
m4/longlong.m4
|
||||
m4/memchr.m4
|
||||
m4/memmem.m4
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
# inttypes-pri.m4 serial 6 (gettext-0.18)
|
||||
dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
AC_PREREQ([2.52])
|
||||
|
||||
# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
|
||||
# macros to non-string values. This is the case on AIX 4.3.3.
|
||||
|
||||
AC_DEFUN([gt_INTTYPES_PRI],
|
||||
[
|
||||
AC_CHECK_HEADERS([inttypes.h])
|
||||
if test $ac_cv_header_inttypes_h = yes; then
|
||||
AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
|
||||
[gt_cv_inttypes_pri_broken],
|
||||
[
|
||||
AC_TRY_COMPILE([#include <inttypes.h>
|
||||
#ifdef PRId32
|
||||
char *p = PRId32;
|
||||
#endif
|
||||
], [], [gt_cv_inttypes_pri_broken=no], [gt_cv_inttypes_pri_broken=yes])
|
||||
])
|
||||
fi
|
||||
if test "$gt_cv_inttypes_pri_broken" = yes; then
|
||||
AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
|
||||
[Define if <inttypes.h> exists and defines unusable PRI* macros.])
|
||||
PRI_MACROS_BROKEN=1
|
||||
else
|
||||
PRI_MACROS_BROKEN=0
|
||||
fi
|
||||
AC_SUBST([PRI_MACROS_BROKEN])
|
||||
])
|
|
@ -0,0 +1,302 @@
|
|||
# inttypes.m4 serial 18
|
||||
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Derek Price, Bruno Haible.
|
||||
dnl Test whether <inttypes.h> is supported or must be substituted.
|
||||
|
||||
AC_DEFUN([gl_INTTYPES_H],
|
||||
[
|
||||
AC_REQUIRE([gl_STDINT_H])
|
||||
AC_REQUIRE([gt_INTTYPES_PRI])
|
||||
AC_CHECK_HEADERS_ONCE([inttypes.h])
|
||||
AC_CHECK_DECLS_ONCE([imaxabs])
|
||||
AC_CHECK_DECLS_ONCE([imaxdiv])
|
||||
AC_CHECK_DECLS_ONCE([strtoimax])
|
||||
AC_CHECK_DECLS_ONCE([strtoumax])
|
||||
|
||||
dnl Now see if we need a substitute <inttypes.h>.
|
||||
dnl A complete <inttypes.h> requires
|
||||
dnl - a complete <stdint.h>,
|
||||
dnl - the existence of an <inttypes.h>,
|
||||
dnl - that imaxabs, imaxdiv, strtoimax, strtoumax are declared,
|
||||
dnl - some additional tests.
|
||||
AC_CACHE_CHECK([whether inttypes.h conforms to C99],
|
||||
[gl_cv_header_working_inttypes_h],
|
||||
[gl_cv_header_working_inttypes_h=no
|
||||
if test "$gl_cv_header_working_stdint_h" = yes \
|
||||
&& test $ac_cv_header_inttypes_h = yes \
|
||||
&& test "$ac_cv_have_decl_imaxabs" = yes \
|
||||
&& test "$ac_cv_have_decl_imaxdiv" = yes \
|
||||
&& test "$ac_cv_have_decl_strtoimax" = yes \
|
||||
&& test "$ac_cv_have_decl_strtoumax" = yes; then
|
||||
AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([[
|
||||
#include <stddef.h>
|
||||
#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
|
||||
#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
|
||||
#define __STDC_FORMAT_MACROS 1 /* to make it work also in C++ mode */
|
||||
#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H /* work if build isn't clean */
|
||||
#include <inttypes.h>
|
||||
|
||||
/* No need to duplicate the tests of stdint.m4; they are subsumed by
|
||||
$gl_cv_header_working_stdint_h = yes. */
|
||||
|
||||
/* Tests for macros supposed to be defined in inttypes.h. */
|
||||
|
||||
const char *k = /* implicit string concatenation */
|
||||
#ifdef INT8_MAX
|
||||
PRId8 PRIi8
|
||||
#endif
|
||||
#ifdef UINT8_MAX
|
||||
PRIo8 PRIu8 PRIx8 PRIX8
|
||||
#endif
|
||||
#ifdef INT16_MAX
|
||||
PRId16 PRIi16
|
||||
#endif
|
||||
#ifdef UINT16_MAX
|
||||
PRIo16 PRIu16 PRIx16 PRIX16
|
||||
#endif
|
||||
#ifdef INT32_MAX
|
||||
PRId32 PRIi32
|
||||
#endif
|
||||
#ifdef UINT32_MAX
|
||||
PRIo32 PRIu32 PRIx32 PRIX32
|
||||
#endif
|
||||
#ifdef INT64_MAX
|
||||
PRId64 PRIi64
|
||||
#endif
|
||||
#ifdef UINT64_MAX
|
||||
PRIo64 PRIu64 PRIx64 PRIX64
|
||||
#endif
|
||||
PRIdLEAST8 PRIiLEAST8 PRIoLEAST8 PRIuLEAST8 PRIxLEAST8 PRIXLEAST8
|
||||
PRIdLEAST16 PRIiLEAST16 PRIoLEAST16 PRIuLEAST16 PRIxLEAST16 PRIXLEAST16
|
||||
PRIdLEAST32 PRIiLEAST32 PRIoLEAST32 PRIuLEAST32 PRIxLEAST32 PRIXLEAST32
|
||||
PRIdLEAST64 PRIiLEAST64
|
||||
PRIoLEAST64 PRIuLEAST64 PRIxLEAST64 PRIXLEAST64
|
||||
PRIdFAST8 PRIiFAST8 PRIoFAST8 PRIuFAST8 PRIxFAST8 PRIXFAST8
|
||||
PRIdFAST16 PRIiFAST16 PRIoFAST16 PRIuFAST16 PRIxFAST16 PRIXFAST16
|
||||
PRIdFAST32 PRIiFAST32 PRIoFAST32 PRIuFAST32 PRIxFAST32 PRIXFAST32
|
||||
PRIdFAST64 PRIiFAST64
|
||||
PRIoFAST64 PRIuFAST64 PRIxFAST64 PRIXFAST64
|
||||
PRIdMAX PRIiMAX PRIoMAX PRIuMAX PRIxMAX PRIXMAX
|
||||
#ifdef INTPTR_MAX
|
||||
PRIdPTR PRIiPTR
|
||||
#endif
|
||||
#ifdef UINTPTR_MAX
|
||||
PRIoPTR PRIuPTR PRIxPTR PRIXPTR
|
||||
#endif
|
||||
;
|
||||
const char *l = /* implicit string concatenation */
|
||||
#ifdef INT8_MAX
|
||||
SCNd8 SCNi8
|
||||
#endif
|
||||
#ifdef UINT8_MAX
|
||||
SCNo8 SCNu8 SCNx8
|
||||
#endif
|
||||
#ifdef INT16_MAX
|
||||
SCNd16 SCNi16
|
||||
#endif
|
||||
#ifdef UINT16_MAX
|
||||
SCNo16 SCNu16 SCNx16
|
||||
#endif
|
||||
#ifdef INT32_MAX
|
||||
SCNd32 SCNi32
|
||||
#endif
|
||||
#ifdef UINT32_MAX
|
||||
SCNo32 SCNu32 SCNx32
|
||||
#endif
|
||||
#ifdef INT64_MAX
|
||||
SCNd64 SCNi64
|
||||
#endif
|
||||
#ifdef UINT64_MAX
|
||||
SCNo64 SCNu64 SCNx64
|
||||
#endif
|
||||
SCNdLEAST8 SCNiLEAST8 SCNoLEAST8 SCNuLEAST8 SCNxLEAST8
|
||||
SCNdLEAST16 SCNiLEAST16 SCNoLEAST16 SCNuLEAST16 SCNxLEAST16
|
||||
SCNdLEAST32 SCNiLEAST32 SCNoLEAST32 SCNuLEAST32 SCNxLEAST32
|
||||
SCNdLEAST64 SCNiLEAST64
|
||||
SCNoLEAST64 SCNuLEAST64 SCNxLEAST64
|
||||
SCNdFAST8 SCNiFAST8 SCNoFAST8 SCNuFAST8 SCNxFAST8
|
||||
SCNdFAST16 SCNiFAST16 SCNoFAST16 SCNuFAST16 SCNxFAST16
|
||||
SCNdFAST32 SCNiFAST32 SCNoFAST32 SCNuFAST32 SCNxFAST32
|
||||
SCNdFAST64 SCNiFAST64
|
||||
SCNoFAST64 SCNuFAST64 SCNxFAST64
|
||||
SCNdMAX SCNiMAX SCNoMAX SCNuMAX SCNxMAX
|
||||
#ifdef INTPTR_MAX
|
||||
SCNdPTR SCNiPTR
|
||||
#endif
|
||||
#ifdef UINTPTR_MAX
|
||||
SCNoPTR SCNuPTR SCNxPTR
|
||||
#endif
|
||||
;
|
||||
]])],
|
||||
[gl_cv_header_working_inttypes_h=yes])
|
||||
fi])
|
||||
|
||||
dnl Override <inttypes.h> always, so that the portability warnings work.
|
||||
AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
|
||||
gl_CHECK_NEXT_HEADERS([inttypes.h])
|
||||
|
||||
AC_REQUIRE([gl_MULTIARCH])
|
||||
|
||||
dnl Ensure that <stdint.h> defines the limit macros, since gnulib's
|
||||
dnl <inttypes.h> relies on them. This macro is only needed when a
|
||||
dnl C++ compiler is in use; it has no effect for a C compiler.
|
||||
dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's
|
||||
dnl <inttypes.h> is going to be created, and to avoid redefinition warnings
|
||||
dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS.
|
||||
AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], [1],
|
||||
[Define to make the limit macros in <stdint.h> visible.])
|
||||
AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ],
|
||||
[/* Ensure that <stdint.h> defines the limit macros, since gnulib's
|
||||
<inttypes.h> relies on them. */
|
||||
#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
|
||||
# define __STDC_LIMIT_MACROS 1
|
||||
#endif
|
||||
])
|
||||
|
||||
PRIPTR_PREFIX=
|
||||
if test -n "$STDINT_H"; then
|
||||
dnl Using the gnulib <stdint.h>. It always defines intptr_t to 'long'.
|
||||
PRIPTR_PREFIX='"l"'
|
||||
else
|
||||
dnl Using the system's <stdint.h>.
|
||||
for glpfx in '' l ll I64; do
|
||||
case $glpfx in
|
||||
'') gltype1='int';;
|
||||
l) gltype1='long int';;
|
||||
ll) gltype1='long long int';;
|
||||
I64) gltype1='__int64';;
|
||||
esac
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM([[#include <stdint.h>
|
||||
extern intptr_t foo;
|
||||
extern $gltype1 foo;]])],
|
||||
[PRIPTR_PREFIX='"'$glpfx'"'])
|
||||
test -n "$PRIPTR_PREFIX" && break
|
||||
done
|
||||
fi
|
||||
AC_SUBST([PRIPTR_PREFIX])
|
||||
|
||||
if test "$ac_cv_have_decl_imaxabs" = yes; then
|
||||
HAVE_DECL_IMAXABS=1
|
||||
else
|
||||
HAVE_DECL_IMAXABS=0
|
||||
fi
|
||||
|
||||
if test "$ac_cv_have_decl_imaxdiv" = yes; then
|
||||
HAVE_DECL_IMAXDIV=1
|
||||
else
|
||||
HAVE_DECL_IMAXDIV=0
|
||||
fi
|
||||
|
||||
if test "$ac_cv_have_decl_strtoimax" = yes; then
|
||||
HAVE_DECL_STRTOIMAX=1
|
||||
else
|
||||
HAVE_DECL_STRTOIMAX=0
|
||||
fi
|
||||
|
||||
if test "$ac_cv_have_decl_strtoumax" = yes; then
|
||||
HAVE_DECL_STRTOUMAX=1
|
||||
else
|
||||
HAVE_DECL_STRTOUMAX=0
|
||||
fi
|
||||
|
||||
gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
|
||||
[INT32_MAX_LT_INTMAX_MAX],
|
||||
[defined INT32_MAX && defined INTMAX_MAX],
|
||||
[INT32_MAX < INTMAX_MAX],
|
||||
[sizeof (int) < sizeof (long long int)])
|
||||
if test $APPLE_UNIVERSAL_BUILD = 0; then
|
||||
gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
|
||||
[INT64_MAX_EQ_LONG_MAX],
|
||||
[defined INT64_MAX],
|
||||
[INT64_MAX == LONG_MAX],
|
||||
[sizeof (long long int) == sizeof (long int)])
|
||||
else
|
||||
INT64_MAX_EQ_LONG_MAX=-1
|
||||
fi
|
||||
gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
|
||||
[UINT32_MAX_LT_UINTMAX_MAX],
|
||||
[defined UINT32_MAX && defined UINTMAX_MAX],
|
||||
[UINT32_MAX < UINTMAX_MAX],
|
||||
[sizeof (unsigned int) < sizeof (unsigned long long int)])
|
||||
if test $APPLE_UNIVERSAL_BUILD = 0; then
|
||||
gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
|
||||
[UINT64_MAX_EQ_ULONG_MAX],
|
||||
[defined UINT64_MAX],
|
||||
[UINT64_MAX == ULONG_MAX],
|
||||
[sizeof (unsigned long long int) == sizeof (unsigned long int)])
|
||||
else
|
||||
UINT64_MAX_EQ_ULONG_MAX=-1
|
||||
fi
|
||||
|
||||
dnl Check for declarations of anything we want to poison if the
|
||||
dnl corresponding gnulib module is not in use.
|
||||
gl_WARN_ON_USE_PREPARE([[#include <inttypes.h>
|
||||
]], [imaxabs imaxdiv strtoimax strtoumax])
|
||||
])
|
||||
|
||||
# Define the symbol $1 to be 1 if the condition is true, 0 otherwise.
|
||||
# If $2 is true, the condition is $3; otherwise if long long int is supported
|
||||
# approximate the condition with $4; otherwise, assume the condition is false.
|
||||
# The condition should work on all C99 platforms; the approximations should be
|
||||
# good enough to work on all practical pre-C99 platforms.
|
||||
# $2 is evaluated by the C preprocessor, $3 and $4 as compile-time constants.
|
||||
AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION],
|
||||
[
|
||||
AC_CACHE_CHECK([whether $3],
|
||||
[gl_cv_test_$1],
|
||||
[AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[/* Work also in C++ mode. */
|
||||
#define __STDC_LIMIT_MACROS 1
|
||||
|
||||
/* Work if build is not clean. */
|
||||
#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H
|
||||
|
||||
#include <limits.h>
|
||||
#if HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
#if $2
|
||||
#define CONDITION ($3)
|
||||
#elif HAVE_LONG_LONG_INT
|
||||
#define CONDITION ($4)
|
||||
#else
|
||||
#define CONDITION 0
|
||||
#endif
|
||||
int test[CONDITION ? 1 : -1];]])],
|
||||
[gl_cv_test_$1=yes],
|
||||
[gl_cv_test_$1=no])])
|
||||
if test $gl_cv_test_$1 = yes; then
|
||||
$1=1;
|
||||
else
|
||||
$1=0;
|
||||
fi
|
||||
AC_SUBST([$1])
|
||||
])
|
||||
|
||||
AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR],
|
||||
[
|
||||
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
|
||||
AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
|
||||
gl_MODULE_INDICATOR_SET_VARIABLE([$1])
|
||||
])
|
||||
|
||||
AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
|
||||
[
|
||||
GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS])
|
||||
GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV])
|
||||
GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX])
|
||||
GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX])
|
||||
dnl Assume proper GNU behavior unless another module says otherwise.
|
||||
HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS])
|
||||
HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV])
|
||||
HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
|
||||
HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
|
||||
])
|
Loading…
Reference in New Issue