summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2000-07-02 20:52:00 +0000
committerKen Raeburn <raeburn@mit.edu>2000-07-02 20:52:00 +0000
commitb6a42e596c12485ed6c34f1934f91084dbc5c2cf (patch)
tree81af71457fe26f972f1f6c4f2a3b47caaa2ec59e
parent582f9f65e4f9397920c0eac1b3341e0246e1de6f (diff)
downloadkrb5-b6a42e596c12485ed6c34f1934f91084dbc5c2cf.tar.gz
krb5-b6a42e596c12485ed6c34f1934f91084dbc5c2cf.tar.xz
krb5-b6a42e596c12485ed6c34f1934f91084dbc5c2cf.zip
back out format-attribute change
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12510 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/util/et/ChangeLog6
-rw-r--r--src/util/et/com_err.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 845e82b08c..9445923a04 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 7288e91ac3..7a8858b386 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));