summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorkristerw <kristerw@NetBSD.org>2007-08-02 21:49:09 +0000
committerkristerw <kristerw@NetBSD.org>2007-08-02 21:49:09 +0000
commit1ef79ebc7d0ea131e8544fc99329bebf7d962541 (patch)
treec15fc711808376b177f36a331214a1bca8e0ad3c /include
parent844b7f67f9066917fd497269d1d03a401cb3de02 (diff)
Do not include SSP files unless _FORTIFY_SOURCE > 0.
Diffstat (limited to 'include')
-rw-r--r--include/stdio.h4
-rw-r--r--include/string.h4
-rw-r--r--include/strings.h4
-rw-r--r--include/unistd.h4
4 files changed, 12 insertions, 4 deletions
diff --git a/include/stdio.h b/include/stdio.h
index e1babd1725f..9785a248d9b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.69 2007/05/30 21:14:37 tls Exp $ */
+/* $NetBSD: stdio.h,v 1.70 2007/08/02 21:49:09 kristerw Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -476,6 +476,8 @@ static __inline int __sputc(int _c, FILE *_p) {
#define putchar_unlocked(x) putc_unlocked(x, stdout)
#endif /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */
+#if _FORTIFY_SOURCE > 0
#include <ssp/stdio.h>
+#endif
#endif /* _STDIO_H_ */
diff --git a/include/string.h b/include/string.h
index 9ed3714d39b..34b4ee61d2a 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.32 2007/05/30 21:14:37 tls Exp $ */
+/* $NetBSD: string.h,v 1.33 2007/08/02 21:49:10 kristerw Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -91,5 +91,7 @@ char *strndup(const char *, size_t);
#endif
__END_DECLS
+#if _FORTIFY_SOURCE > 0
#include <ssp/string.h>
+#endif
#endif /* !defined(_STRING_H_) */
diff --git a/include/strings.h b/include/strings.h
index d0cf08e9559..4c45512a9ff 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,4 +1,4 @@
-/* $NetBSD: strings.h,v 1.11 2007/05/30 21:14:37 tls Exp $ */
+/* $NetBSD: strings.h,v 1.12 2007/08/02 21:49:10 kristerw Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,5 +68,7 @@ __END_DECLS
#include <string.h>
#endif
+#if _FORTIFY_SOURCE > 0
#include <ssp/strings.h>
+#endif
#endif /* !defined(_STRINGS_H_) */
diff --git a/include/unistd.h b/include/unistd.h
index f85d0147f19..8171cf6e8b0 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.111 2007/05/30 21:14:37 tls Exp $ */
+/* $NetBSD: unistd.h,v 1.112 2007/08/02 21:49:10 kristerw Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -364,5 +364,7 @@ extern char *suboptarg; /* getsubopt(3) external variable */
__END_DECLS
+#if _FORTIFY_SOURCE > 0
#include <ssp/unistd.h>
+#endif
#endif /* !_UNISTD_H_ */