# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1318809586 25200
# Node ID 3c249f388e463ace2a2de8ed4997de07671c31f1
# Parent  d3ffa7ff0caf67816afe7287a8b27e47179e1d02
argp: use stdalign

* lib/argp-parse.c: Include <stdalign.h>.
(alignof): Remove.
* modules/argp (Depends-on): Add stdalign.

diff --git a/ChangeLog b/ChangeLog
--- 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 <stdalign.h>.
+	(alignof): Remove.
+	* modules/argp (Depends-on): Add stdalign.
+
 2011-10-27  Bruno Haible  <bruno@clisp.org>
 
 	raise test: Avoid a test failure on Linux/MIPS.
diff --git a/lib/argp-parse.c b/lib/argp-parse.c
--- a/lib/argp-parse.c
+++ b/lib/argp-parse.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <alloca.h>
+#include <stdalign.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -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
--- a/modules/argp
+++ b/modules/argp
@@ -35,6 +35,7 @@
 extensions
 vsnprintf
 sleep
+stdalign
 strerror
 memchr
 memmove