From 96a01acfe9ab027698458042af67cf78b94b16b3 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 26 Jan 2018 16:53:36 -0500 Subject: [PATCH] Revert "libc: make stdio_impl.h an internal libc header" This reverts commit 871ea16d7300b0f549611b7a56fe4082a4187d90. --- include/Makefile | 1 + {usr/src/lib/libc/inc => include}/stdio_impl.h | 0 usr/src/lib/libc/inc/stdiom.h | 2 +- usr/src/lib/libc/port/gen/nss_common.c | 2 +- usr/src/pkg/manifests/system-header.mf | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) rename {usr/src/lib/libc/inc => include}/stdio_impl.h (100%) diff --git a/include/Makefile b/include/Makefile index 986f4d8c82..d81ccafab0 100644 --- a/include/Makefile +++ b/include/Makefile @@ -142,6 +142,7 @@ INCS= $($(CONFIG_MACH)_INCS) \ stdio.h \ stdio_ext.h \ stdio_tag.h \ + stdio_impl.h \ stdlib.h \ stdnoreturn.h \ storclass.h \ diff --git a/usr/src/lib/libc/inc/stdio_impl.h b/include/stdio_impl.h similarity index 100% rename from usr/src/lib/libc/inc/stdio_impl.h rename to include/stdio_impl.h diff --git a/usr/src/lib/libc/inc/stdiom.h b/usr/src/lib/libc/inc/stdiom.h index 1a2f9ca6a5..2583ec61b3 100644 --- a/usr/src/lib/libc/inc/stdiom.h +++ b/usr/src/lib/libc/inc/stdiom.h @@ -43,7 +43,7 @@ #include "file64.h" #include #include "mse.h" -#include "stdio_impl.h" +#include extern __FILE __iob[_NFILE]; diff --git a/usr/src/lib/libc/port/gen/nss_common.c b/usr/src/lib/libc/port/gen/nss_common.c index d1c23f576e..e4c880bfa2 100644 --- a/usr/src/lib/libc/port/gen/nss_common.c +++ b/usr/src/lib/libc/port/gen/nss_common.c @@ -49,7 +49,7 @@ #include #include #include -#include "stdio_impl.h" +#include #include "libc.h" #include "tsd.h" diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index dd0e73af74..32413247c6 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -586,6 +586,7 @@ file path=usr/include/stddef.h file path=usr/include/stdint.h file path=usr/include/stdio.h file path=usr/include/stdio_ext.h +file path=usr/include/stdio_impl.h file path=usr/include/stdio_tag.h file path=usr/include/stdlib.h file path=usr/include/stdnoreturn.h -- 2.11.4.GIT