summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-02 15:41:37 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-02 15:41:37 +0000
commitdcdae19a3f8eafb7aa597b1d5cb770db76509ec4 (patch)
treecb7d1bc6bb22bfab7c17e8fdbfc581486b6ee1ea
parent7dcf35f775f8a867195b660b1d9fb6d627a5b002 (diff)
downloadglibc-dcdae19a3f8eafb7aa597b1d5cb770db76509ec4.tar.gz
glibc-dcdae19a3f8eafb7aa597b1d5cb770db76509ec4.tar.xz
glibc-dcdae19a3f8eafb7aa597b1d5cb770db76509ec4.zip
Test _ISOMAC in include/sys/syslog.h.
-rw-r--r--ChangeLog5
-rw-r--r--include/sys/syslog.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0600968d6a..5dad3dc1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* include/sys/syslog.h [_ISOMAC]: Disable all contents of file
+	except include of <misc/sys/syslog.h>.
+
 2012-11-01  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: If the
diff --git a/include/sys/syslog.h b/include/sys/syslog.h
index c08cfcd1fa..3be3189ed1 100644
--- a/include/sys/syslog.h
+++ b/include/sys/syslog.h
@@ -1,5 +1,6 @@
 #include <misc/sys/syslog.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (syslog)
 libc_hidden_proto (vsyslog)
 
@@ -7,3 +8,4 @@ extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt,
 			   __gnuc_va_list __ap)
      __attribute__ ((__format__ (__printf__, 3, 0)));
 libc_hidden_proto (__vsyslog_chk)
+#endif