9 files changed, 9 insertions, 45 deletions

diff --git a/include/poll.h b/include/poll.h
index ac79695..5e27850 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 int
@@ -42,8 +40,6 @@ __fortify_ppoll(struct pollfd *fds, nfds_t nfds,
 #define ppoll(fds, nfds, timeout, mask) __fortify_ppoll(fds, nfds, timeout, mask)
 #endif
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/stdio.h b/include/stdio.h
index ab9b00f..0c32728 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 char *
@@ -108,8 +106,6 @@ __fortify_vsnprintf(char *s, size_t n, const char *fmt, __builtin_va_list ap)
         r; \
 })
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/stdlib.h b/include/stdlib.h
index 312555c..4422f5e 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -9,9 +9,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 static inline __attribute__ ((always_inline))
@@ -36,8 +34,6 @@ __fortify_realpath(const char *path, char *resolved)
 #define realpath(path, resolved) __fortify_realpath(path, resolved)
 #endif
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/string.h b/include/string.h
index 2f513ca..b0979cc 100644
--- a/include/string.h
+++ b/include/string.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 void *
@@ -190,8 +188,6 @@ __fortify_strlcpy(char *dest, const char *src, size_t n)
 #define strlcpy(dest, src, n) __fortify_strlcpy(dest, src, n)
 #endif
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/strings.h b/include/strings.h
index 0862b58..1609171 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \
  || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \
@@ -40,8 +38,6 @@ __fortify_bzero(void *src, size_t n)
 #define bzero(src, n) __fortify_bzero(src, n)
 #endif
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/sys/select.h b/include/sys/select.h
index 50bdb6a..9e56450 100644
--- a/include/sys/select.h
+++ b/include/sys/select.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 int
@@ -36,8 +34,6 @@ __fortify_FD_SET(int fd, fd_set *set)
 #undef FD_SET
 #define FD_SET(fd, set) __fortify_FD_SET(fd, set)
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/sys/socket.h b/include/sys/socket.h
index fc7381a..02ff2ab 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 ssize_t
@@ -64,8 +62,6 @@ __fortify_sendto(int sockfd, const void *buf, size_t n, int flags,
 #undef sendto
 #define sendto(sockfd, buf, n, flags, sa, salen) __fortify_sendto(sockfd, buf, n, flags, sa, salen)
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 2403db1..05b6688 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -5,9 +5,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 size_t
@@ -172,8 +170,6 @@ __fortify_write(int fd, const void *buf, size_t n)
 #undef write
 #define write(fd, buf, n) __fortify_write(fd, buf, n)
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif
diff --git a/include/wchar.h b/include/wchar.h
index 8a72e35..9180603 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -6,9 +6,7 @@
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __cplusplus
 
 static inline __attribute__ ((always_inline))
 wchar_t *
@@ -253,8 +251,6 @@ __fortify_wmemset(wchar_t *s, wchar_t c, size_t n)
 #undef wmemset
 #define wmemset(s, c, n) __fortify_wmemset(s, c, n)
 
-#ifdef __cplusplus
-}
 #endif
 
 #endif