@@ -16,13 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _SYS_SYSLOG_H
-# error "Never include this file directly. Use <sys/syslog.h> instead"
-#endif
-
#ifndef _BITS_SYSLOG_PATH_H
#define _BITS_SYSLOG_PATH_H 1
+#ifndef _SYSLOG_H
+# error "Never include <bits/syslog-path.h> directly. Use <syslog.h> instead"
+#endif
+
#define _PATH_LOG "/dev/log"
#endif /* bits/syslog-path.h */
dissimilarity index 93%
@@ -?,? +1,3 @@
+#ifndef _SYSLOG_H
+#include <misc/sys/syslog.h>
+#endif
similarity index 81%
copy from include/sys/syslog.h
copy to include/syslog.h
@@ -1,6 +1,5 @@
-#ifndef _LIBC_SYS_SYSLOG_H
-#define _LIBC_SYS_SYSLOG_H 1
-#include <misc/sys/syslog.h>
+#ifndef _SYSLOG_H
+# include <misc/syslog.h>
#ifndef _ISOMAC
libc_hidden_proto (syslog)
@@ -16,8 +16,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _SYS_SYSLOG_H
-# error "Never include <bits/syslog-ldbl.h> directly; use <sys/syslog.h> instead."
+#ifndef _BITS_SYSLOG_LDBL_H
+#define _BITS_SYSLOG_LDBL_H 1
+
+#ifndef _SYSLOG_H
+# error "Never include <bits/syslog-ldbl.h> directly; use <syslog.h> instead."
#endif
__LDBL_REDIR_DECL (syslog)
@@ -33,3 +36,5 @@ __LDBL_REDIR_DECL (__syslog_chk)
__LDBL_REDIR_DECL (__vsyslog_chk)
# endif
#endif
+
+#endif /* bits/syslog-ldbl.h */
@@ -16,8 +16,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef _SYS_SYSLOG_H
-# error "Never include <bits/syslog.h> directly; use <sys/syslog.h> instead."
+#ifndef _BITS_SYSLOG_H
+#define _BITS_SYSLOG_H 1
+
+#ifndef _SYSLOG_H
+# error "Never include <bits/syslog.h> directly; use <syslog.h> instead."
#endif
@@ -47,3 +50,5 @@ vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap)
__vsyslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
}
#endif
+
+#endif /* bits/syslog.h */
dissimilarity index 99%
@@ -?,? +1,3 @@
+#ifndef _SYSLOG_H
+# include <syslog.h>
+#endif
similarity index 99%
copy from misc/sys/syslog.h
copy to misc/syslog.h
@@ -29,8 +29,8 @@
* @(#)syslog.h 8.1 (Berkeley) 6/2/93
*/
-#ifndef _SYS_SYSLOG_H
-#define _SYS_SYSLOG_H 1
+#ifndef _SYSLOG_H
+#define _SYSLOG_H 1
#include <features.h>
#define __need___va_list
@@ -635,12 +635,12 @@ HEADER_ALLOWED_INCLUDES = {
"memory.h": [ "string.h" ],
"poll.h": [ "sys/poll.h" ],
"re_comp.h": [ "regex.h" ],
- "syslog.h": [ "sys/syslog.h" ],
"sys/bitypes.h": [ "sys/types.h" ],
"sys/dir.h": [ "dirent.h" ],
"sys/errno.h": [ "errno.h" ],
"sys/fcntl.h": [ "fcntl.h" ],
"sys/signal.h": [ "signal.h" ],
+ "sys/syslog.h": [ "syslog.h" ],
"sys/termios.h": [ "termios.h" ],
"sys/unistd.h": [ "unistd.h" ],
"syscall.h": [ "sys/syscall.h" ],