[gnome-keyring/gnome-3-0] Fix build with GCC 4.6.0

[Stefan Walter <stefw src gnome org>]

commit 6bd797cff9d4d402a8ef906d259dac0bf707e70d
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Jun 7 16:33:50 2011 +0000

    Fix build with GCC 4.6.0

 configure.in                     |    1 +
 daemon/gkd-main.c                |    2 +-
 daemon/gpg-agent/gkd-gpg-agent.c |    2 +-
 daemon/ssh-agent/gkd-ssh-agent.c |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 23baa20..fefb03a 100644
--- a/configure.in
+++ b/configure.in
@@ -140,6 +140,7 @@ AC_TRY_COMPILE([
 ],[
 socklen_t foo;
 foo = 1;
+foo = foo;
 ],have_socklen_t=yes,have_socklen_t=no)
 AC_MSG_RESULT($have_socklen_t)
 
diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
index 18e3766..f5cc5d6 100644
--- a/daemon/gkd-main.c
+++ b/daemon/gkd-main.c
@@ -69,7 +69,7 @@
 #define  STDERR  2
 
 #ifndef HAVE_SOCKLEN_T
-#define socklen_t int
+typedef int socklen_t;
 #endif
 
 #define GKD_COMP_KEYRING    "keyring"
diff --git a/daemon/gpg-agent/gkd-gpg-agent.c b/daemon/gpg-agent/gkd-gpg-agent.c
index e09b6fd..0acff2f 100644
--- a/daemon/gpg-agent/gkd-gpg-agent.c
+++ b/daemon/gpg-agent/gkd-gpg-agent.c
@@ -39,7 +39,7 @@
 #include "egg/egg-secure-memory.h"
 
 #ifndef HAVE_SOCKLEN_T
-#define socklen_t int
+typedef int socklen_t;
 #endif
 
 /* The loaded PKCS#11 module */
diff --git a/daemon/ssh-agent/gkd-ssh-agent.c b/daemon/ssh-agent/gkd-ssh-agent.c
index eb8d21f..a9b6114 100644
--- a/daemon/ssh-agent/gkd-ssh-agent.c
+++ b/daemon/ssh-agent/gkd-ssh-agent.c
@@ -41,7 +41,7 @@
 #include "egg/egg-secure-memory.h"
 
 #ifndef HAVE_SOCKLEN_T
-#define socklen_t int
+typedef int socklen_t;
 #endif
 
 /* The loaded PKCS#11 modules */