headers: crt: Merge swprintf.inl into corecrt_wstdio.h

It's not referenced elsewhere, and it doesn't contain any inline
definitions now.

Accoredingly updated configure.ac and Makefile.am.

Signed-off-by: Zhongteng Gui <dragon-archer@outlook.com>
Signed-off-by: LIU Hao <lh_mouse@126.com>

mingw-w64-headers/Makefile.am

diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
index f7479bb..3f30a33 100644
--- a/mingw-w64-headers/Makefile.am
+++ b/mingw-w64-headers/Makefile.am
@@ -46,7 +46,6 @@
   include/wrl/*.h \
   include/wrl/wrappers/*.h \
   crt/*.h \
-  crt/*.inl \
   crt/sys/*.h \
   ddk/include/ddk/*.h \
   tlb/*.tlb

mingw-w64-headers/configure.ac

diff --git a/mingw-w64-headers/configure.ac b/mingw-w64-headers/configure.ac
index 4d2ad24..039cb4a 100644
--- a/mingw-w64-headers/configure.ac
+++ b/mingw-w64-headers/configure.ac
@@ -65,7 +65,7 @@
 AM_CONDITIONAL([ENABLE_CRT],[test x$enable_crt=xyes])
 AC_MSG_RESULT([$enable_crt])
 AS_VAR_IF([enable_crt],[yes],[
-  BASEHEAD_LIST="$BASEHEAD_LIST "$srcdir/crt/*.h" "$srcdir/crt/*.inl
+  BASEHEAD_LIST="$BASEHEAD_LIST "$srcdir/crt/*.h
   SYSHEAD_LIST=$srcdir/crt/sys/*.h
 ])
 GDIPLUSHEAD_LIST=$srcdir/include/gdiplus/*.h

mingw-w64-headers/crt/corecrt_wstdio.h

diff --git a/mingw-w64-headers/crt/corecrt_wstdio.h b/mingw-w64-headers/crt/corecrt_wstdio.h
index 2779981..2267226 100644
--- a/mingw-w64-headers/crt/corecrt_wstdio.h
+++ b/mingw-w64-headers/crt/corecrt_wstdio.h
@@ -600,7 +600,26 @@
 #endif /* !_UCRT */
 
 #ifndef RC_INVOKED
-#include <swprintf.inl>
+
+#ifdef __cplusplus
+
+extern "C++" {
+
+/* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
+int vswprintf (wchar_t *__stream, const wchar_t *__format, __builtin_va_list __local_argv) __MINGW_ASM_CALL(_vswprintf);
+
+/* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
+int swprintf (wchar_t *__stream, const wchar_t *__format, ...) __MINGW_ASM_CALL(_swprintf);
+
+}
+
+#elif defined(_CRT_NON_CONFORMING_SWPRINTFS)
+
+#define swprintf _swprintf
+#define vswprintf _vswprintf
+
+#endif /* __cplusplus */
+
 #endif
 
 #ifdef _CRT_NON_CONFORMING_SWPRINTFS

mingw-w64-headers/crt/swprintf.inl

diff --git a/mingw-w64-headers/crt/swprintf.inl b/mingw-w64-headers/crt/swprintf.inl
deleted file mode 100644
index 7adfbb6..0000000
--- a/mingw-w64-headers/crt/swprintf.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#ifndef _INC_SWPRINTF_INL
-#define _INC_SWPRINTF_INL
-
-#ifdef __cplusplus
-
-extern "C++" {
-
-/* __attribute__((__format__ (gnu_wprintf, 2, 0))) */ __MINGW_ATTRIB_NONNULL(2)
-int vswprintf (wchar_t *__stream, const wchar_t *__format, __builtin_va_list __local_argv) __MINGW_ASM_CALL(_vswprintf);
-
-/* __attribute__((__format__ (gnu_wprintf, 2, 3))) */ __MINGW_ATTRIB_NONNULL(2)
-int swprintf (wchar_t *__stream, const wchar_t *__format, ...) __MINGW_ASM_CALL(_swprintf);
-
-}
-
-#elif defined(_CRT_NON_CONFORMING_SWPRINTFS)
-
-#define swprintf _swprintf
-#define vswprintf _vswprintf
-
-#endif /* __cplusplus */
-
-#endif /* _INC_SWPRINTF_INL */