2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d4bcde07..152287c58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
    - jmc@cvs.openbsd.org 2005/07/08 12:53:10
      [ssh_config.5]
      new sentence, new line;
+   - dtucker@cvs.openbsd.org 2005/07/14 04:00:43
+     [misc.h]
+     use __sentinel__ attribute; ok deraadt@ djm@ markus@
 
 20050707
  - dtucker [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for
@@ -2818,4 +2821,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3843 2005/07/14 07:06:50 dtucker Exp $
+$Id: ChangeLog,v 1.3844 2005/07/14 07:07:21 dtucker Exp $
diff --git a/misc.h b/misc.h
index 92848b28e..2d630feb5 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: misc.h,v 1.24 2005/07/04 00:58:43 djm Exp $   */
+/*      $OpenBSD: misc.h,v 1.25 2005/07/14 04:00:43 dtucker Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -25,7 +25,7 @@ char	*cleanhostname(char *);
 char    *colon(char *);
 long     convtime(const char *);
 char    *tilde_expand_filename(const char *, uid_t);
-char    *percent_expand(const char *, ...) __attribute__((sentinel));
+char    *percent_expand(const char *, ...) __attribute__((__sentinel__));
 char    *tohex(const u_char *, u_int);
 
 struct passwd *pwcopy(struct passwd *);