From 29218b265fdbdda394f563aa70566766b125aa3a Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Mon, 11 Mar 2019 10:59:45 -0400
Subject: [PATCH] Move inttypes.h and stdint.h to stdlib.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

inttypes.h and stdint.h are in sysdeps/generic, but there are no other
versions of these headers anywhere in the source tree, so they aren’t
actually system-dependent.  Move them to the subdirectory that
installs them (stdlib).

Reviewed-by: Joseph Myers <joseph@codesourcery.com>

	* sysdeps/generic/inttypes.h, sysdeps/generic/stdint.h:
	Move to stdlib.
	* include/inttypes.h: Adjust to match.
	* include/stdint.h: New wrapper.
---
 ChangeLog                              | 7 +++++++
 include/inttypes.h                     | 2 +-
 include/stdint.h                       | 1 +
 {sysdeps/generic => stdlib}/inttypes.h | 0
 {sysdeps/generic => stdlib}/stdint.h   | 0
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 include/stdint.h
 rename {sysdeps/generic => stdlib}/inttypes.h (100%)
 rename {sysdeps/generic => stdlib}/stdint.h (100%)

diff --git a/ChangeLog b/ChangeLog
index 9ff1949f8a..d616178156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-03-13  Zack Weinberg  <zackw@panix.com>
+
+	* sysdeps/generic/inttypes.h, sysdeps/generic/stdint.h:
+	Move to stdlib.
+	* include/inttypes.h: Adjust to match.
+	* include/stdint.h: New wrapper.
+
 2019-03-13  Zack Weinberg  <zackw@panix.com>
 
 	* scripts/check-obsolete-constructs.py: New test script.
diff --git a/include/inttypes.h b/include/inttypes.h
index 33219e2a9f..3a583c6c07 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,5 +1,5 @@
 #ifndef _INTTYPES_H
-#include_next <inttypes.h>
+#include <stdlib/inttypes.h>
 #ifndef _ISOMAC
 libc_hidden_proto (strtoumax)
 #endif
diff --git a/include/stdint.h b/include/stdint.h
new file mode 100644
index 0000000000..7f428741d7
--- /dev/null
+++ b/include/stdint.h
@@ -0,0 +1 @@
+#include <stdlib/stdint.h>
diff --git a/sysdeps/generic/inttypes.h b/stdlib/inttypes.h
similarity index 100%
rename from sysdeps/generic/inttypes.h
rename to stdlib/inttypes.h
diff --git a/sysdeps/generic/stdint.h b/stdlib/stdint.h
similarity index 100%
rename from sysdeps/generic/stdint.h
rename to stdlib/stdint.h