diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-20 12:48:14 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-01-20 12:48:14 -0800 |
| commit | cec62009bb94b74bb46dd911a22dc1ec97097970 (patch) | |
| tree | 7e8e3569612303588ff164fa070e8210c7c00ec4 /lib | |
| parent | 2d3c36db70ea118d3168a43e92b750c8999d60a6 (diff) | |
| download | emacs-cec62009bb94b74bb46dd911a22dc1ec97097970.tar.gz | |
Merge from gnulib.
This incorporates:
2014-01-20 stdalign: port to HP-UX compilers
2014-01-16 strtoimax: port to platforms lacking 'long long'
2014-01-16 update from texinfo
* doc/misc/texinfo.tex, lib/stdalign.in.h, lib/strtoimax.c:
Update from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdalign.in.h | 3 | ||||
| -rw-r--r-- | lib/strtoimax.c | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index f9adf663b38..dcaab55b577 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -95,7 +95,8 @@ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 # if defined __cplusplus && 201103 <= __cplusplus # define _Alignas(a) alignas (a) -# elif __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C +# elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ + || __ICC || 0x5110 <= __SUNPRO_C) # define _Alignas(a) __attribute__ ((__aligned__ (a))) # elif 1300 <= _MSC_VER # define _Alignas(a) __declspec (align (a)) diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 219ebaf523d..2c33d5857a9 100644 --- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -28,20 +28,24 @@ #include "verify.h" #ifdef UNSIGNED -# ifndef HAVE_DECL_STRTOULL +# if HAVE_UNSIGNED_LONG_LONG_INT +# ifndef HAVE_DECL_STRTOULL "this configure-time declaration test was not run" -# endif -# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG_INT +# endif +# if !HAVE_DECL_STRTOULL unsigned long long int strtoull (char const *, char **, int); +# endif # endif #else -# ifndef HAVE_DECL_STRTOLL +# if HAVE_LONG_LONG_INT +# ifndef HAVE_DECL_STRTOLL "this configure-time declaration test was not run" -# endif -# if !HAVE_DECL_STRTOLL && HAVE_LONG_LONG_INT +# endif +# if !HAVE_DECL_STRTOLL long long int strtoll (char const *, char **, int); +# endif # endif #endif |