diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-07 17:04:49 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-07 18:10:11 -0700 |
| commit | 12a7e0f88eaa68aabe7e32589e2d5c8f776f6346 (patch) | |
| tree | ac3b18f919ab71149b7fe50fdcaf7a953cced651 /lib/time_rz.c | |
| parent | a08ce41ed8e9fd8768dcd1ecd22ff6bc4c4c7f8f (diff) | |
| download | emacs-12a7e0f88eaa68aabe7e32589e2d5c8f776f6346.tar.gz emacs-12a7e0f88eaa68aabe7e32589e2d5c8f776f6346.tar.bz2 emacs-12a7e0f88eaa68aabe7e32589e2d5c8f776f6346.zip | |
Update from gnulib
This incorporates:
2016-09-07 flexmember: new macro FLEXALIGNOF
2016-09-07 flexmember: port better to GCC + valgrind
2016-08-18 Port modules to use getprogname explicitly
2016-09-02 manywarnings: add -fno-common
* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don’t avoid flexmember,
since time_rz now uses part of it. Instead, remove m4/flexmember.m4.
* configure.ac (AC_C_FLEXIBLE_ARRAY_MEMBER): Define away,
since Emacs assumes C99 and therefore removes m4/flexmember.m4.
* lib/euidaccess.c, lib/group-member.c, lib/time_rz.c:
* m4/manywarnings.m4: Copy from gnulib.
* lib/flexmember.h: New file, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/time_rz.c')
| -rw-r--r-- | lib/time_rz.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/time_rz.c b/lib/time_rz.c index 55b764ea8b3..38afb5fc3cd 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -32,6 +32,7 @@ #include <stdlib.h> #include <string.h> +#include "flexmember.h" #include "time-internal.h" #if !HAVE_TZSET @@ -94,7 +95,7 @@ tzalloc (char const *name) { size_t name_size = name ? strlen (name) + 1 : 0; size_t abbr_size = name_size < ABBR_SIZE_MIN ? ABBR_SIZE_MIN : name_size + 1; - timezone_t tz = malloc (offsetof (struct tm_zone, abbrs) + abbr_size); + timezone_t tz = malloc (FLEXSIZEOF (struct tm_zone, abbrs, abbr_size)); if (tz) { tz->next = NULL; |