diff options
Diffstat (limited to 'gl/sockets.h')
-rw-r--r-- | gl/sockets.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gl/sockets.h b/gl/sockets.h index 921bf6f7..1570ad84 100644 --- a/gl/sockets.h +++ b/gl/sockets.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* sockets.h - wrappers for Windows socket functions | 1 | /* sockets.h - wrappers for Windows socket functions |
2 | 2 | ||
3 | Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 2008-2013 Free Software Foundation, Inc. |
4 | 4 | ||
5 | This program is free software: you can redistribute it and/or modify | 5 | This program is free software: you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
@@ -26,8 +26,17 @@ | |||
26 | #define SOCKETS_2_1 0x201 | 26 | #define SOCKETS_2_1 0x201 |
27 | #define SOCKETS_2_2 0x202 | 27 | #define SOCKETS_2_2 0x202 |
28 | 28 | ||
29 | int gl_sockets_startup (int version); | 29 | int gl_sockets_startup (int version) |
30 | int gl_sockets_cleanup (void); | 30 | #if !WINDOWS_SOCKETS |
31 | _GL_ATTRIBUTE_CONST | ||
32 | #endif | ||
33 | ; | ||
34 | |||
35 | int gl_sockets_cleanup (void) | ||
36 | #if !WINDOWS_SOCKETS | ||
37 | _GL_ATTRIBUTE_CONST | ||
38 | #endif | ||
39 | ; | ||
31 | 40 | ||
32 | /* This function is useful it you create a socket using gnulib's | 41 | /* This function is useful it you create a socket using gnulib's |
33 | Winsock wrappers but needs to pass on the socket handle to some | 42 | Winsock wrappers but needs to pass on the socket handle to some |
@@ -36,6 +45,8 @@ int gl_sockets_cleanup (void); | |||
36 | 45 | ||
37 | #include <sys/socket.h> | 46 | #include <sys/socket.h> |
38 | 47 | ||
48 | #include "msvc-nothrow.h" | ||
49 | |||
39 | static inline SOCKET | 50 | static inline SOCKET |
40 | gl_fd_to_handle (int fd) | 51 | gl_fd_to_handle (int fd) |
41 | { | 52 | { |