diff options
Diffstat (limited to 'missing_d')
| -rw-r--r-- | missing_d/ChangeLog | 5 | ||||
| -rw-r--r-- | missing_d/intprops.h | 4 | ||||
| -rw-r--r-- | missing_d/mktime.c | 6 | ||||
| -rw-r--r-- | missing_d/verify.h | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/missing_d/ChangeLog b/missing_d/ChangeLog index 2990bd3f..6752ddcb 100644 --- a/missing_d/ChangeLog +++ b/missing_d/ChangeLog @@ -1,3 +1,8 @@ +2018-09-21 Arnold D. Robbins <arnold@skeeve.com> + + * intprops.h, mktime.c, verify.h: Updated from GNULIB. + * mktime-internal.h: New file, imported from GNULIB. + 2018-09-07 Arnold D. Robbins <arnold@skeeve.com> * intprops.h, mktime.c: Updated from GNULIB. diff --git a/missing_d/intprops.h b/missing_d/intprops.h index a4be30b8..9702aec4 100644 --- a/missing_d/intprops.h +++ b/missing_d/intprops.h @@ -342,8 +342,8 @@ Arguments should be free of side effects. */ #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \ op_result_overflow (a, b, \ - _GL_INT_MINIMUM ((1 ? 0 : (b)) + (a)), \ - _GL_INT_MAXIMUM ((1 ? 0 : (b)) + (a))) + _GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \ + _GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b))) /* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. Return 1 if the result overflows. See above for restrictions. */ diff --git a/missing_d/mktime.c b/missing_d/mktime.c index 1a332e14..3ecab0d1 100644 --- a/missing_d/mktime.c +++ b/missing_d/mktime.c @@ -76,11 +76,7 @@ # define NEED_MKTIME_WORKING DEBUG_MKTIME #endif -#ifdef _LIBC -typedef long int mktime_offset_t; -#else # include "mktime-internal.h" -#endif #ifndef _LIBC static void @@ -531,7 +527,7 @@ mktime (struct tm *tp) be set as if the tzset() function had been called. */ __tzset (); -# if defined __LIBC || NEED_MKTIME_WORKING +# if defined _LIBC || NEED_MKTIME_WORKING static mktime_offset_t localtime_offset; return __mktime_internal (tp, __localtime_r, &localtime_offset); # else diff --git a/missing_d/verify.h b/missing_d/verify.h index bc7f99db..3b57ddee 100644 --- a/missing_d/verify.h +++ b/missing_d/verify.h @@ -276,7 +276,8 @@ template <int w> when 'assume' silences warnings even with older GCCs. */ # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) #else -# define assume(R) ((void) (0 && (R))) + /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ +# define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) #endif /* @assert.h omit end@ */ |