Remove unnecessary stdalign.in.h

* lib/stdalign.in.h: Remove.  This file was already removed in
commit b429274c5b4b2b511d2d351111dea2d354498e0f (2023-02-04)
but was brought back mistakenly by a merge from emacs-29 in
commit ecf08f0621c25ad1dfadd96399e204c389ab1695 (2024-01-02).
* nt/inc/stdalign.h: Don’t mention removed file in comment.

(cherry picked from commit 8661f40ce4d6bce649cb2a564f7c4e766318476c)

diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h
deleted file mode 100644 (file)
index 49172cc..0000000
--- a/lib/stdalign.in.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* A substitute for ISO C11 <stdalign.h>.
-
-   Copyright 2011-2025 Free Software Foundation, Inc.
-
-   This file is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   This file is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-
-/* Written by Paul Eggert and Bruno Haible.  */
-
-/* Define two obsolescent C11 macros, assuming alignas and alignof are
-   either keywords or alignasof-defined macros.  */
-
-#ifndef _@GUARD_PREFIX@_STDALIGN_H
-
-#if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-#endif
-@PRAGMA_COLUMNS@
-
-/* We need to include the system's <stdalign.h> when it exists, because it might
-   define 'alignof' as a macro when it's not a keyword or compiler built-in.  */
-#if @HAVE_STDALIGN_H@
-/* The include_next requires a split double-inclusion guard.  */
-# @INCLUDE_NEXT@ @NEXT_STDALIGN_H@
-#endif
-
-#ifndef _@GUARD_PREFIX@_STDALIGN_H
-#define _@GUARD_PREFIX@_STDALIGN_H
-
-#if (defined alignas \
-     || (defined __STDC_VERSION__ && 202311 <= __STDC_VERSION__) \
-     || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)))
-# define __alignas_is_defined 1
-#endif
-
-#define __alignof_is_defined 1
-
-#endif /* _@GUARD_PREFIX@_STDALIGN_H */
-#endif /* _@GUARD_PREFIX@_STDALIGN_H */

diff --git a/nt/inc/stdalign.h b/nt/inc/stdalign.h
index 7e349dc31d0a2a94ae7eb67c0d2e808595697008..808407156fa97b520cd54b9679d87cd7070d4502 100644 (file)
--- a/nt/inc/stdalign.h
+++ b/nt/inc/stdalign.h
@@ -1,9 +1,6 @@
 #ifndef _NT_STDALIGN_H_
 #define _NT_STDALIGN_H_
 
-/* This header has the necessary stuff from lib/stdalign.in.h, but
-   avoids the need to have Sed at build time.  */
-
 #include <stddef.h>
 #if defined __cplusplus
    template <class __t> struct __alignof_helper { char __a; __t __b; };