diff options
Diffstat (limited to 'gl/sockets.h')
-rw-r--r-- | gl/sockets.h | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/gl/sockets.h b/gl/sockets.h index 1570ad84..e70c2bbf 100644 --- a/gl/sockets.h +++ b/gl/sockets.h | |||
@@ -1,39 +1,39 @@ | |||
1 | /* sockets.h - wrappers for Windows socket functions | 1 | /* sockets.h - wrappers for Windows socket functions |
2 | 2 | ||
3 | Copyright (C) 2008-2013 Free Software Foundation, Inc. | 3 | Copyright (C) 2008-2021 Free Software Foundation, Inc. |
4 | 4 | ||
5 | This program is free software: you can redistribute it and/or modify | 5 | This file 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 Lesser General Public License as |
7 | the Free Software Foundation; either version 3 of the License, or | 7 | published by the Free Software Foundation; either version 2.1 of the |
8 | (at your option) any later version. | 8 | License, or (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This file is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU Lesser General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU Lesser General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ | 16 | along with this program. If not, see <https://www.gnu.org/licenses/>. */ |
17 | 17 | ||
18 | /* Written by Simon Josefsson */ | 18 | /* Written by Simon Josefsson */ |
19 | 19 | ||
20 | #ifndef SOCKETS_H | 20 | #ifndef SOCKETS_H |
21 | # define SOCKETS_H 1 | 21 | #define SOCKETS_H 1 |
22 | 22 | ||
23 | #define SOCKETS_1_0 0x100 /* don't use - does not work on Windows XP */ | 23 | #define SOCKETS_1_0 0x0001 |
24 | #define SOCKETS_1_1 0x101 | 24 | #define SOCKETS_1_1 0x0101 |
25 | #define SOCKETS_2_0 0x200 /* don't use - does not work on Windows XP */ | 25 | #define SOCKETS_2_0 0x0002 |
26 | #define SOCKETS_2_1 0x201 | 26 | #define SOCKETS_2_1 0x0102 |
27 | #define SOCKETS_2_2 0x202 | 27 | #define SOCKETS_2_2 0x0202 |
28 | 28 | ||
29 | int gl_sockets_startup (int version) | 29 | int gl_sockets_startup (int version) |
30 | #if !WINDOWS_SOCKETS | 30 | #ifndef WINDOWS_SOCKETS |
31 | _GL_ATTRIBUTE_CONST | 31 | _GL_ATTRIBUTE_CONST |
32 | #endif | 32 | #endif |
33 | ; | 33 | ; |
34 | 34 | ||
35 | int gl_sockets_cleanup (void) | 35 | int gl_sockets_cleanup (void) |
36 | #if !WINDOWS_SOCKETS | 36 | #ifndef WINDOWS_SOCKETS |
37 | _GL_ATTRIBUTE_CONST | 37 | _GL_ATTRIBUTE_CONST |
38 | #endif | 38 | #endif |
39 | ; | 39 | ; |
@@ -41,11 +41,15 @@ int gl_sockets_cleanup (void) | |||
41 | /* 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 |
42 | 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 |
43 | other library that only accepts sockets. */ | 43 | other library that only accepts sockets. */ |
44 | #if WINDOWS_SOCKETS | 44 | #ifdef WINDOWS_SOCKETS |
45 | 45 | ||
46 | #include <sys/socket.h> | 46 | # include <sys/socket.h> |
47 | 47 | ||
48 | #include "msvc-nothrow.h" | 48 | # if GNULIB_MSVC_NOTHROW |
49 | # include "msvc-nothrow.h" | ||
50 | # else | ||
51 | # include <io.h> | ||
52 | # endif | ||
49 | 53 | ||
50 | static inline SOCKET | 54 | static inline SOCKET |
51 | gl_fd_to_handle (int fd) | 55 | gl_fd_to_handle (int fd) |
@@ -55,7 +59,7 @@ gl_fd_to_handle (int fd) | |||
55 | 59 | ||
56 | #else | 60 | #else |
57 | 61 | ||
58 | #define gl_fd_to_handle(x) (x) | 62 | # define gl_fd_to_handle(x) (x) |
59 | 63 | ||
60 | #endif /* WINDOWS_SOCKETS */ | 64 | #endif /* WINDOWS_SOCKETS */ |
61 | 65 | ||