diff options
| author |   millert <millert@openbsd.org> | 2008-09-29 17:35:51 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2008-09-29 17:35:51 +0000 |
| commit | 7bfa9f444b545f1bc96a4b2919ed2583bf07c7ea (patch) | |
| tree | a27ed65c25e4fb26d9bca8126dbdf2b189894d6a /gnu/usr.bin/perl/win32/include/sys/socket.h | |
| parent | import perl 5.10.0 from CPAN (diff) | |
| download | wireguard-openbsd-7bfa9f444b545f1bc96a4b2919ed2583bf07c7ea.tar.xz wireguard-openbsd-7bfa9f444b545f1bc96a4b2919ed2583bf07c7ea.zip | |
fix conflicts and merge in local changes to perl 5.10.0
Diffstat (limited to 'gnu/usr.bin/perl/win32/include/sys/socket.h')
| -rw-r--r-- | gnu/usr.bin/perl/win32/include/sys/socket.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/usr.bin/perl/win32/include/sys/socket.h b/gnu/usr.bin/perl/win32/include/sys/socket.h index d2ef6e7752c..a3c53b0e883 100644 --- a/gnu/usr.bin/perl/win32/include/sys/socket.h +++ b/gnu/usr.bin/perl/win32/include/sys/socket.h @@ -16,10 +16,16 @@ extern "C" { #endif #include <windows.h> + /* Too late to include winsock2.h if winsock.h has already been loaded */ #ifndef _WINSOCKAPI_ +# if defined(UNDER_CE) && UNDER_CE <= 300 + /* winsock2 only for 4.00+ */ +# include <winsock.h> +# else # include <winsock2.h> #endif +#endif #include "win32.h" |