From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 19 Nov 2004 17:32:25 +0000 (+0000)
Subject: __attribute__ is already defined in compat.h
X-Git-Tag: SUDO_1_7_0~801
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55d6af8463bc826dc9993ac8f43784125389d681;p=sudo

__attribute__ is already defined in compat.h
---

diff --git a/error.h b/error.h
index b42417941..87562beac 100644
--- a/error.h
+++ b/error.h
@@ -21,20 +21,12 @@
 
 #ifdef __STDC__
 # include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5
-#define __attribute__(x)
-#endif
-
-#ifdef __STDC__
 void	error(int, const char *, ...) __attribute__((__noreturn__));
 void	errorx(int, const char *, ...) __attribute__((__noreturn__));
 void	warning(const char *, ...);
 void	warningx(const char *, ...);
 #else
+# include <varargs.h>
 void	error() __attribute__((__noreturn__));
 void	errorx() __attribute__((__noreturn__));
 void	warning();