diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-01-24 09:44:38 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-01-24 09:44:38 +0000 |
| commit | 80bf23d7c96135b8279d6910fa6663eddc503580 (patch) | |
| tree | 4a6cd01ad939de68ff843759fc54f2c71d0d3d4a /libsoup/soup-socket.c | |
| parent | 925502b8ccc58ac4ee2e6d19f3038e2986b4edaf (diff) | |
| download | libsoup-80bf23d7c96135b8279d6910fa6663eddc503580.tar.gz | |
Allow autogening even without AM_PATH_LIBGCRYPT available
2008-01-23 Tor Lillqvist <tml@novell.com>
* configure.in: Allow autogening even without AM_PATH_LIBGCRYPT
available
* libsoup/soup-date.c (soup_date_new_from_time_t): Correct use of
gmtime().
* libsoup/soup-headers.c (soup_headers_parse_status_line): Return
FALSE if neither HTTP nor ICY. Avoids crash in
tests/header-parsing.
* libsoup/soup-socket.c: On Windows SHUT_RDWR is called SD_BOTH.
(set_nonblocking): Fix typo.
* tests/continue-test.c: Seems to build fine without <pthread.h>,
so drop that.
svn path=/trunk/; revision=1051
Diffstat (limited to 'libsoup/soup-socket.c')
| -rw-r--r-- | libsoup/soup-socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libsoup/soup-socket.c b/libsoup/soup-socket.c index 953c6f8e..003d5222 100644 --- a/libsoup/soup-socket.c +++ b/libsoup/soup-socket.c @@ -90,6 +90,7 @@ static void get_property (GObject *object, guint prop_id, #define SOUP_IS_SOCKET_ERROR(status) ((status) == SOCKET_ERROR) #define SOUP_IS_INVALID_SOCKET(socket) ((socket) == INVALID_SOCKET) #define SOUP_IS_CONNECT_STATUS_INPROGRESS() (WSAGetLastError () == WSAEWOULDBLOCK) +#define SHUT_RDWR SD_BOTH #else #define SOUP_IS_SOCKET_ERROR(status) ((status) == -1) #define SOUP_IS_INVALID_SOCKET(socket) ((socket) < 0) @@ -298,7 +299,7 @@ set_nonblocking (SoupSocketPrivate *priv) #ifndef G_OS_WIN32 int flags; #else - u_log val; + u_long val; #endif if (priv->sockfd == -1) |