From: Jim Meyering <meyering@redhat.com>
Date: Sat, 1 May 2010 09:29:39 +0000 (+0200)
Subject: stat: use gnulib's alignof module
X-Git-Tag: v8.6~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78c1111c004352ea296fc2bb4cb579c8ec1646db;p=thirdparty%2Fcoreutils.git

stat: use gnulib's alignof module

* src/stat.c (alignof): Remove definition.
Instead, include "alignof.h", and sort the #include directives.
And get its definition from the gnulib module by that name:
* bootstrap.conf (gnulib_modules): Add alignof.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 8d34d198f7..576d308dce 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -40,6 +40,7 @@ gnulib_modules="
   $avoided_gnulib_modules
   $obsolete_gnulib_modules
   acl
+  alignof
   alloca
   announce-gen
   areadlink-with-size
diff --git a/src/stat.c b/src/stat.c
index e6de541e2d..39d30777ea 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -57,18 +57,17 @@
 
 #include "system.h"
 
+#include "alignof.h"
+#include "areadlink.h"
 #include "error.h"
-#include "filemode.h"
 #include "file-type.h"
+#include "filemode.h"
 #include "fs.h"
 #include "getopt.h"
 #include "quote.h"
 #include "quotearg.h"
 #include "stat-time.h"
 #include "strftime.h"
-#include "areadlink.h"
-
-#define alignof(type) offsetof (struct { char c; type x; }, x)
 
 #if USE_STATVFS
 # define STRUCT_STATVFS struct statvfs