From bebd93f5da72542b6e867a5fd1e2c524e0fae1c1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 Oct 2011 16:59:46 -0700 Subject: [PATCH] argp: use stdalign * lib/argp-parse.c: Include . (alignof): Remove. * modules/argp (Depends-on): Add stdalign. --- ChangeLog | 5 +++++ lib/argp-parse.c | 2 +- modules/argp | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7b607346ee..0b9d921381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,11 @@ stdalign-tests: new module * modules/stdalign-tests, tests/test-stdalign.c: New files. + argp: use stdalign + * lib/argp-parse.c: Include . + (alignof): Remove. + * modules/argp (Depends-on): Add stdalign. + 2011-10-27 Bruno Haible raise test: Avoid a test failure on Linux/MIPS. diff --git a/lib/argp-parse.c b/lib/argp-parse.c index 5cab8cec35..64360beac0 100644 --- a/lib/argp-parse.c +++ b/lib/argp-parse.c @@ -21,6 +21,7 @@ #endif #include +#include #include #include #include @@ -42,7 +43,6 @@ #include "argp.h" #include "argp-namefrob.h" -#define alignof(type) offsetof (struct { char c; type x; }, x) #define alignto(n, d) ((((n) + (d) - 1) / (d)) * (d)) /* Getopt return values. */ diff --git a/modules/argp b/modules/argp index fa39580eaf..8d496812d8 100644 --- a/modules/argp +++ b/modules/argp @@ -35,6 +35,7 @@ strcase extensions vsnprintf sleep +stdalign strerror memchr memmove -- 2.39.5