From b3f87f4f6c59ef2465028310bef5edab2e10af7c Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Thu, 8 Jan 2004 12:32:04 +0000
Subject: [PATCH]  - (dtucker) [auth-pam.c defines.h] Bug #783: move __unused
 to defines.h and    only define if not already.  From des at freebsd.org.

---
 ChangeLog  | 4 ++++
 auth-pam.c | 2 --
 defines.h  | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 205fa0e4..e5d82b09 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.
diff --git a/auth-pam.c b/auth-pam.c
index 9f0bec03..583ee668 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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 c20d466e..3865e34d 100644
--- a/defines.h
+++ b/defines.h
@@ -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 */
-- 
2.45.1