diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-22 16:53:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-22 16:53:21 -0700 |
| commit | c38918db05bb8df4619bff27d04a0dc48202b647 (patch) | |
| tree | 32627a31919dbfa46c7f9463b5c1765ecdd5c808 /lib | |
| parent | 03eb7af5765b8921f1724813908ae823ff35baaa (diff) | |
| download | emacs-c38918db05bb8df4619bff27d04a0dc48202b647.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnulib.mk | 6 | ||||
| -rw-r--r-- | lib/inttypes.in.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 4da8bb89733..d79f3c2b571 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -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=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime readlink socklen stdio strftime strtoumax symlink sys_stat warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdio strftime strtoumax symlink sys_stat MOSTLYCLEANFILES += core *.stackdump @@ -174,7 +174,7 @@ EXTRA_DIST += intprops.h ## end gnulib module intprops -## begin gnulib module inttypes +## begin gnulib module inttypes-h BUILT_SOURCES += inttypes.h @@ -214,7 +214,7 @@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t EXTRA_DIST += inttypes.in.h -## end gnulib module inttypes +## end gnulib module inttypes-h ## begin gnulib module lstat diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 6a8f46dddc2..7abf39403f0 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1076,6 +1076,7 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - " #if @GNULIB_STRTOIMAX@ # if !@HAVE_DECL_STRTOIMAX@ +# undef strtoimax extern intmax_t strtoimax (const char *, char **, int) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK @@ -1088,6 +1089,7 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - " #if @GNULIB_STRTOUMAX@ # if !@HAVE_DECL_STRTOUMAX@ +# undef strtoumax extern uintmax_t strtoumax (const char *, char **, int) _GL_ARG_NONNULL ((1)); # endif #elif defined GNULIB_POSIXCHECK |