diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-22 18:42:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-22 18:44:04 -0800 |
| commit | e3040f2aee768655198dd6f979a1ff3a72d17d16 (patch) | |
| tree | 3e4f1fa270b9f1dfee6b4009e2097f5d0bdc4e16 /lib | |
| parent | b11d8924b565bd96939537b10a70bb3c26532bed (diff) | |
| download | emacs-e3040f2aee768655198dd6f979a1ff3a72d17d16.tar.gz | |
Merge from gnulib
2014-12-20 utimens: remove unnecessary assert
2014-12-16 stdalign: port better to HP compilers
2014-12-16 stdalign: work around Apple GCC 4.0 bug
* lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdalign.in.h | 5 | ||||
| -rw-r--r-- | lib/utimens.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index dcaab55b577..413936df78c 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -95,7 +95,10 @@ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 # if defined __cplusplus && 201103 <= __cplusplus # define _Alignas(a) alignas (a) -# elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ +# elif ((defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__) \ + || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ || __ICC || 0x5110 <= __SUNPRO_C) # define _Alignas(a) __attribute__ ((__aligned__ (a))) # elif 1300 <= _MSC_VER diff --git a/lib/utimens.c b/lib/utimens.c index dd3ec668f37..04441037631 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -24,7 +24,6 @@ #define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE #include "utimens.h" -#include <assert.h> #include <errno.h> #include <fcntl.h> #include <stdbool.h> @@ -87,7 +86,6 @@ validate_timespec (struct timespec timespec[2]) { int result = 0; int utime_omit_count = 0; - assert (timespec); if ((timespec[0].tv_nsec != UTIME_NOW && timespec[0].tv_nsec != UTIME_OMIT && ! (0 <= timespec[0].tv_nsec |