From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 13 Sep 2022 22:29:36 +0000 (-0500)
Subject: stdalign: prefer to not include <stdalign.h>
X-Git-Tag: v1.0~2027
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b098a986b8013a3b2dba395240d77886404ebaf7;p=thirdparty%2Fgnulib.git

stdalign: prefer to not include <stdalign.h>

* lib/alignalloc.c, lib/argp-parse.c, lib/fts.c, lib/md4.c, lib/md5.c:
* lib/rawmemchr.c, lib/sha1.c, lib/sha256.c, lib/sha512.c, lib/sm3.c:
* lib/sys_socket.in.h:
In C23, <stdalign.h> is a no-op, so don’t include it.
---

diff --git a/ChangeLog b/ChangeLog
index e05f581282..3e291ebf8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
 
 2022-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+	stdalign: prefer to not include <stdalign.h>
+	* lib/alignalloc.c, lib/argp-parse.c, lib/fts.c, lib/md4.c, lib/md5.c:
+	* lib/rawmemchr.c, lib/sha1.c, lib/sha256.c, lib/sha512.c, lib/sm3.c:
+	* lib/sys_socket.in.h:
+	In C23, <stdalign.h> is a no-op, so don’t include it.
+
 	stdalign: alignas and alignof are C23 keywords
 	* m4/stdalign.m4 (gl_STDALIGN_H): Check also whether
 	alignas and alignof are keywords and so don’t need stdalign.h,
diff --git a/lib/alignalloc.c b/lib/alignalloc.c
index 1be5d4d2ba..d5922e16ac 100644
--- a/lib/alignalloc.c
+++ b/lib/alignalloc.c
@@ -23,7 +23,6 @@
 #include "alignalloc.h"
 
 #include <limits.h>
-#include <stdalign.h>
 #include <stdckdint.h>
 #include <stdint.h>
 
diff --git a/lib/argp-parse.c b/lib/argp-parse.c
index 90b2c9b146..9bd422ca7b 100644
--- a/lib/argp-parse.c
+++ b/lib/argp-parse.c
@@ -21,7 +21,6 @@
 #endif
 
 #include <alloca.h>
-#include <stdalign.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/fts.c b/lib/fts.c
index 7778b6b786..954cbb7b40 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -62,7 +62,6 @@ static char sccsid[] = "@(#)fts.c       8.6 (Berkeley) 8/14/94";
 #endif
 #include <fcntl.h>
 #include <errno.h>
-#include <stdalign.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/md4.c b/lib/md4.c
index 9355f186d7..aebd39c6c4 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -24,7 +24,6 @@
 /* Specification.  */
 #include "md4.h"
 
-#include <stdalign.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/md5.c b/lib/md5.c
index 57489ed74c..c16ac4a93a 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -27,7 +27,6 @@
 #endif
 #include "md5.h"
 
-#include <stdalign.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c
index c789599db8..bdd7307de4 100644
--- a/lib/rawmemchr.c
+++ b/lib/rawmemchr.c
@@ -23,7 +23,6 @@
 #if !HAVE_RAWMEMCHR
 
 # include <limits.h>
-# include <stdalign.h>
 # include <stdint.h>
 
 
diff --git a/lib/sha1.c b/lib/sha1.c
index 79e50ba0b0..5a18213edc 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -29,7 +29,6 @@
 #endif
 #include "sha1.h"
 
-#include <stdalign.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lib/sha256.c b/lib/sha256.c
index c9ca618c67..60cd763612 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -28,7 +28,6 @@
 #endif
 #include "sha256.h"
 
-#include <stdalign.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lib/sha512.c b/lib/sha512.c
index 6776bb464d..fd17a7dc76 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -28,7 +28,6 @@
 #endif
 #include "sha512.h"
 
-#include <stdalign.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lib/sm3.c b/lib/sm3.c
index 5594945315..a7402906b1 100644
--- a/lib/sm3.c
+++ b/lib/sm3.c
@@ -31,7 +31,6 @@
 #endif
 #include "sm3.h"
 
-#include <stdalign.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index acdf7eee50..637a248d15 100644
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -97,7 +97,6 @@ typedef unsigned char   sa_family_t;
 #  endif
 # endif
 #else
-# include <stdalign.h>
 /* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on
    2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */
 # define __ss_aligntype unsigned long int