diff options
| -rw-r--r-- | src/cli.c | 2 | ||||
| -rw-r--r-- | src/psk-gaa.c | 2 | ||||
| -rw-r--r-- | src/psk.gaa | 2 | ||||
| -rw-r--r-- | src/serv.c | 2 | ||||
| -rw-r--r-- | src/tests.c | 4 |
5 files changed, 8 insertions, 4 deletions
@@ -44,6 +44,8 @@ #include "cli-gaa.h" #if defined _WIN32 || defined __WIN32__ +int _win_select(int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds, + const struct timeval *tv); #define select _win_select #endif diff --git a/src/psk-gaa.c b/src/psk-gaa.c index 5a77c3c3ee..928986e586 100644 --- a/src/psk-gaa.c +++ b/src/psk-gaa.c @@ -567,7 +567,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval) { #line 28 "psk.gaa" -{ gaaval->username=NULL; gaaval->passwd=NULL; gaaval->key_size = NULL; ;}; +{ gaaval->username=NULL; gaaval->passwd=NULL; gaaval->key_size = 0; ;}; } inited = 1; diff --git a/src/psk.gaa b/src/psk.gaa index 24660b1487..db2edcf880 100644 --- a/src/psk.gaa +++ b/src/psk.gaa @@ -25,5 +25,5 @@ option (s, keysize) INT "SIZE" { $key_size = $1 } "specify the key size in bytes option (v, version) { psktool_version(); exit(0); } "prints the program's version number" option (h, help) { gaa_help(); exit(0); } "shows this help text" -init { $username=NULL; $passwd=NULL; $key_size = NULL; } +init { $username=NULL; $passwd=NULL; $key_size = 0; } diff --git a/src/serv.c b/src/serv.c index d77d0c67b9..2edaca30e6 100644 --- a/src/serv.c +++ b/src/serv.c @@ -39,6 +39,8 @@ #include <list.h> #if defined _WIN32 || defined __WIN32__ +int _win_select(int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds, + const struct timeval *tv); #define select _win_select #endif diff --git a/src/tests.c b/src/tests.c index 130b5e16e0..66cd61baf4 100644 --- a/src/tests.c +++ b/src/tests.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007 Free Software Foundation + * Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation * Copyright (C) 2000,2001,2002,2003 Nikos Mavrogiannopoulos * * This file is part of GNUTLS. @@ -514,7 +514,7 @@ test_bye (gnutls_session_t session) old = siginterrupt (SIGALRM, 1); alarm (secs); #else - setsockopt (gnutls_transport_get_ptr (session), SOL_SOCKET, SO_RCVTIMEO, + setsockopt ((int)gnutls_transport_get_ptr (session), SOL_SOCKET, SO_RCVTIMEO, (char *) &secs, sizeof (int)); #endif |