diff options
| author | Paul Eggert | 2015-12-18 15:41:45 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-12-18 15:42:12 -0800 |
| commit | 73b3beb56dd573a77fd7b103014f2d74674f2e23 (patch) | |
| tree | 27a552222062dbf966f4442ed5e1eec77ba53d4f /lib | |
| parent | 81e523fc4d3dcb0cf59a69f45786d2691f982695 (diff) | |
| download | emacs-73b3beb56dd573a77fd7b103014f2d74674f2e23.tar.gz emacs-73b3beb56dd573a77fd7b103014f2d74674f2e23.zip | |
Merge from gnulib
This mostly commentary fixes.
* doc/misc/texinfo.tex, lib/intprops.h: Copy from gnulib.
* lib/gnulib.mk: Regenerate with new gnulib-tool.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnulib.mk | 2 | ||||
| -rw-r--r-- | lib/intprops.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 67c7e184016..17a01af0adb 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | # the same distribution terms as the rest of that program. | 21 | # the same distribution terms as the rest of that program. |
| 22 | # | 22 | # |
| 23 | # Generated by gnulib-tool. | 23 | # Generated by gnulib-tool. |
| 24 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=flexmember --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --avoid=unsetenv --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time stdalign stddef stdio stpcpy strftime strtoimax strtoumax symlink sys_stat sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings | 24 | # Reproduce by: gnulib-tool --import --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=flexmember --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --avoid=unsetenv --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat sig2str socklen stat-time stdalign stddef stdio stpcpy strftime strtoimax strtoumax symlink sys_stat sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | MOSTLYCLEANFILES += core *.stackdump | 27 | MOSTLYCLEANFILES += core *.stackdump |
diff --git a/lib/intprops.h b/lib/intprops.h index 8fff86d4371..ecafaf70e15 100644 --- a/lib/intprops.h +++ b/lib/intprops.h | |||
| @@ -272,9 +272,10 @@ | |||
| 272 | 272 | ||
| 273 | Example usage, assuming A and B are long int: | 273 | Example usage, assuming A and B are long int: |
| 274 | 274 | ||
| 275 | long int result = INT_MULTIPLY_WRAPV (a, b); | 275 | if (INT_MULTIPLY_OVERFLOW (a, b)) |
| 276 | printf ("result is %ld (%s)\n", result, | 276 | printf ("result would overflow\n"); |
| 277 | INT_MULTIPLY_OVERFLOW (a, b) ? "after overflow" : "no overflow"); | 277 | else |
| 278 | printf ("result is %ld (no overflow)\n", a * b); | ||
| 278 | 279 | ||
| 279 | Example usage with WRAPV flavor: | 280 | Example usage with WRAPV flavor: |
| 280 | 281 | ||