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

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

diff --git a/ChangeLog b/ChangeLog
index 205fa0e4cd6ce9652dfff046c73419a34c9629f9..e5d82b098ada9110a4e681a1b1088a4f3696c52f 100644 (file)
--- 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 9f0bec03f9e34920053449208d42706799d99582..583ee668eeda4bb4e7558f41c36d8108a1552882 100644 (file)
--- 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 c20d466ec916420ee664641da0c9dad80c0be18c..3865e34d63df72c7c9f3a935531182272587535a 100644 (file)
--- 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 */