From 6e4f53a3f50eb987fb5a7657b2ba4eecbfac0557 Mon Sep 17 00:00:00 2001
From: sin
Date: Wed, 4 Feb 2015 18:06:57 +0000
Subject: Remember to #undef __errordecl

Thanks zhasha for spotting this.
---
 include/stdio.h      | 2 ++
 include/string.h     | 2 ++
 include/strings.h    | 2 ++
 include/sys/socket.h | 2 ++
 include/unistd.h     | 2 ++
 5 files changed, 10 insertions(+)

(limited to 'include')

diff --git a/include/stdio.h b/include/stdio.h
index 5426d08..2bed0b4 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -58,6 +58,8 @@ __errordecl(__snprintf_error, "snprintf: buffer overflow detected");
 	snprintf(s, _n, fmt, ## __VA_ARGS__); \
 })
 
+#undef __errordecl
+
 #endif
 
 #endif
diff --git a/include/string.h b/include/string.h
index 3725bbb..86e5cde 100644
--- a/include/string.h
+++ b/include/string.h
@@ -224,6 +224,8 @@ __fortify_strlcpy(char *dest, const char *src, size_t n)
 #define strlcpy(dest, src, n) __fortify_strlcpy(dest, src, n)
 #endif
 
+#undef __errordecl
+
 #endif
 
 #endif
diff --git a/include/strings.h b/include/strings.h
index 0531083..04f22ee 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -47,6 +47,8 @@ __fortify_bzero(void *src, size_t n)
 #define bzero(src, n) __fortify_bzero(src, n)
 #endif
 
+#undef __errordecl
+
 #endif
 
 #endif
diff --git a/include/sys/socket.h b/include/sys/socket.h
index bd9fed4..0174eee 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -43,6 +43,8 @@ __fortify_recvfrom(int sockfd, void *buf, size_t n, int flags, struct sockaddr *
 #undef recvfrom
 #define recvfrom(sockfd, buf, n, flags, sa, salen) __fortify_recvfrom(sockfd, buf, n, flags, sa, salen)
 
+#undef __errordecl
+
 #endif
 
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 65dadb3..f930acd 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -43,6 +43,8 @@ __fortify_read(int fd, void *buf, size_t n)
 #undef read
 #define read(fd, buf, n) __fortify_read(fd, buf, n)
 
+#undef __errordecl
+
 #endif
 
 #endif
-- 
cgit v1.3