diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-02-22 10:33:14 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-02-22 10:33:45 -0800 |
| commit | c87a165040864919ae5ae23b97935300fa4ad119 (patch) | |
| tree | a54a49e4692d44e44c48afdee48b8c57739e40ef | |
| parent | 202c3319a28c029d6971dccea92f92425c5e8067 (diff) | |
| download | emacs-c87a165040864919ae5ae23b97935300fa4ad119.tar.gz | |
Update from Gnulib
This incorporates:
2020-02-21 largefile: remove _DARWIN_USE_64_BIT_INODE
2020-02-21 Add ‘extern "C"’ to count-one-bits.h etc.
* lib/count-leading-zeros.h, lib/count-one-bits.h:
* lib/count-trailing-zeros.h, m4/largefile.m4: Copy from Gnulib.
| -rw-r--r-- | lib/count-leading-zeros.h | 8 | ||||
| -rw-r--r-- | lib/count-one-bits.h | 8 | ||||
| -rw-r--r-- | lib/count-trailing-zeros.h | 8 | ||||
| -rw-r--r-- | m4/largefile.m4 | 3 |
4 files changed, 24 insertions, 3 deletions
diff --git a/lib/count-leading-zeros.h b/lib/count-leading-zeros.h index b548754e181..7e88c8cb9d0 100644 --- a/lib/count-leading-zeros.h +++ b/lib/count-leading-zeros.h @@ -30,6 +30,10 @@ _GL_INLINE_HEADER_BEGIN # define COUNT_LEADING_ZEROS_INLINE _GL_INLINE #endif +#ifdef __cplusplus +extern "C" { +#endif + /* Assuming the GCC builtin is BUILTIN and the MSC builtin is MSC_BUILTIN, expand to code that computes the number of leading zeros of the local variable 'x' of type TYPE (an unsigned integer type) and return it @@ -108,6 +112,10 @@ count_leading_zeros_ll (unsigned long long int x) unsigned long long int); } +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif /* COUNT_LEADING_ZEROS_H */ diff --git a/lib/count-one-bits.h b/lib/count-one-bits.h index 78770e4240d..eea56d85910 100644 --- a/lib/count-one-bits.h +++ b/lib/count-one-bits.h @@ -30,6 +30,10 @@ _GL_INLINE_HEADER_BEGIN # define COUNT_ONE_BITS_INLINE _GL_INLINE #endif +#ifdef __cplusplus +extern "C" { +#endif + /* Expand to code that computes the number of 1-bits of the local variable 'x' of type TYPE (an unsigned integer type) and return it from the current function. */ @@ -129,6 +133,10 @@ count_one_bits_ll (unsigned long long int x) COUNT_ONE_BITS (__builtin_popcountll, __popcnt64, unsigned long long int); } +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif /* COUNT_ONE_BITS_H */ diff --git a/lib/count-trailing-zeros.h b/lib/count-trailing-zeros.h index 2169f626251..1eb5fb919f4 100644 --- a/lib/count-trailing-zeros.h +++ b/lib/count-trailing-zeros.h @@ -30,6 +30,10 @@ _GL_INLINE_HEADER_BEGIN # define COUNT_TRAILING_ZEROS_INLINE _GL_INLINE #endif +#ifdef __cplusplus +extern "C" { +#endif + /* Assuming the GCC builtin is BUILTIN and the MSC builtin is MSC_BUILTIN, expand to code that computes the number of trailing zeros of the local variable 'x' of type TYPE (an unsigned integer type) and return it @@ -100,6 +104,10 @@ count_trailing_zeros_ll (unsigned long long int x) unsigned long long int); } +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif diff --git a/m4/largefile.m4 b/m4/largefile.m4 index e381339c40c..8017ca70eb4 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -113,9 +113,6 @@ if test "$enable_largefile" != no; then [Define for large files, on AIX-style hosts.], [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi - - AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1], - [Enable large inode numbers on Mac OS X 10.5.]) fi ])# AC_SYS_LARGEFILE ])# m4_version_prereq 2.70 |