- (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and

   only define if not already.  From des at freebsd.org.

3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e6311050..a79b9fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040108
+ - (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and
+   only define if not already.  From des at freebsd.org.
+
 20040105
  - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails.  Patch from
    cjwatson at debian.org.
@@ -1650,4 +1654,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3163 2004/01/05 11:36:51 dtucker Exp $
+$Id: ChangeLog,v 1.3164 2004/01/08 12:32:04 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 31e1999f..5c77edb6 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -31,7 +31,7 @@
 
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.87 2004/01/02 07:01:31 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.88 2004/01/08 12:32:04 dtucker Exp $");
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -59,8 +59,6 @@ extern ServerOptions options;
 extern Buffer loginmsg;
 extern int compat20;
 
-#define __unused
-
 #ifdef USE_POSIX_THREADS
 #include <pthread.h>
 /*
diff --git a/defines.h b/defines.h
index d84c378d..18d8995d 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.106 2003/12/18 23:58:43 dtucker Exp $ */
+/* $Id: defines.h,v 1.107 2004/01/08 12:32:04 dtucker Exp $ */
 
 
 /* Constants */
@@ -129,6 +129,10 @@ including rpc/rpc.h breaks Solaris 6
 #define INADDR_LOOPBACK ((u_long)0x7f000001)
 #endif
 
+#ifndef __unused
+#define __unused
+#endif
+
 /* Types */
 
 /* If sys/types.h does not supply intXX_t, supply them ourselves */