From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 2 Jul 2000 20:52:00 +0000 (+0000)
Subject: back out format-attribute change
X-Git-Tag: krb5-1.3-alpha1~2027
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6a42e596c12485ed6c34f1934f91084dbc5c2cf;p=krb5.git

back out format-attribute change

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12510 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 845e82b08..9445923a0 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-02  Ken Raeburn  <raeburn@mit.edu>
+
+	* com_err.h (com_err): Undo previous change; com_err accepts a
+	null pointer in place of the format string, but gcc warns about
+	it.
+
 2000-06-26  Ken Raeburn  <raeburn@mit.edu>
 
 	* com_err.h (com_err): Declare with format attribute if using
diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 7288e91ac..7a8858b38 100644
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -69,11 +69,7 @@ extern "C" {
 #endif
 
 KRB5_DLLIMP extern void KRB5_CALLCONV_C com_err
-	ET_STDARG_P((const char FAR *, errcode_t, const char FAR *, ...))
-#if !defined (__cplusplus) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
-       __attribute__ ((__format__ (__printf__, 3, 4)))
-#endif
-	;
+	ET_STDARG_P((const char FAR *, errcode_t, const char FAR *, ...));
 KRB5_DLLIMP extern void KRB5_CALLCONV com_err_va
 	ET_P((const char FAR *whoami, errcode_t code, const char FAR *fmt,
 	      va_list ap));