lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-07-29 13:01:14 +03:00
Code Activity

windows: use built-in _WIN32 macro to detect Windows

Browse Source 
Instead of `WIN32`.

The compiler defines `_WIN32`. Windows SDK headers or build env defines
`WIN32`, or we have to take care of it. The agreement seems to be that
`_WIN32` is the preferred practice here.

Minor downside is that CMake uses `WIN32` and we also adopted it in
`Makefile.mk`.

In public libssh2 headers we stick with accepting either `_WIN32` or
`WIN32` and define our own namespaced `LIBSSH2_WIN32` based on them.

grepping for `WIN32` remains useful to detect Windows-specific code.

Closes #1195
This commit is contained in:
Viktor Szakats
2023-09-29 08:43:40 +00:00
parent 4c241d5c65
commit 6fbc9505d8
33 changed files with 87 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
example/direct_tcpip.c
View File

@ -6,7 +6,7 @@
#include "libssh2_setup.h" #include "libssh2_setup.h"
#include <libssh2.h> #include <libssh2.h>
#ifdef WIN32 #ifdef _WIN32
#include <ws2tcpip.h> /* for socklen_t */ #include <ws2tcpip.h> /* for socklen_t */
#define recv(s, b, l, f) recv((s), (b), (int)(l), (f)) #define recv(s, b, l, f) recv((s), (b), (int)(l), (f))
#define send(s, b, l, f) send((s), (b), (int)(l), (f)) #define send(s, b, l, f) send((s), (b), (int)(l), (f))
@ -72,7 +72,7 @@ int main(int argc, char *argv[])
libssh2_socket_t listensock = LIBSSH2_INVALID_SOCKET; libssh2_socket_t listensock = LIBSSH2_INVALID_SOCKET;
libssh2_socket_t forwardsock = LIBSSH2_INVALID_SOCKET; libssh2_socket_t forwardsock = LIBSSH2_INVALID_SOCKET;
#ifdef WIN32 #ifdef _WIN32
char sockopt; char sockopt;
WSADATA wsadata; WSADATA wsadata;
@ -311,7 +311,7 @@ shutdown:
if(forwardsock != LIBSSH2_INVALID_SOCKET) { if(forwardsock != LIBSSH2_INVALID_SOCKET) {
shutdown(forwardsock, 2); shutdown(forwardsock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(forwardsock); closesocket(forwardsock);
#else #else
close(forwardsock); close(forwardsock);
@ -320,7 +320,7 @@ shutdown:
if(listensock != LIBSSH2_INVALID_SOCKET) { if(listensock != LIBSSH2_INVALID_SOCKET) {
shutdown(listensock, 2); shutdown(listensock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(listensock); closesocket(listensock);
#else #else
close(listensock); close(listensock);
@ -337,7 +337,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

6
example/scp.c
View File

@ -8,7 +8,7 @@
#include "libssh2_setup.h" #include "libssh2_setup.h"
#include <libssh2.h> #include <libssh2.h>
#ifdef WIN32 #ifdef _WIN32
#define write(f, b, c) write((f), (b), (unsigned int)(c)) #define write(f, b, c) write((f), (b), (unsigned int)(c))
#endif #endif
@ -46,7 +46,7 @@ int main(int argc, char *argv[])
libssh2_struct_stat fileinfo; libssh2_struct_stat fileinfo;
libssh2_struct_stat_size got = 0; libssh2_struct_stat_size got = 0;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -182,7 +182,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

6
example/scp_nonblock.c
View File

@ -13,7 +13,7 @@
#include "libssh2_setup.h" #include "libssh2_setup.h"
#include <libssh2.h> #include <libssh2.h>
#ifdef WIN32 #ifdef _WIN32
#define write(f, b, c) write((f), (b), (unsigned int)(c)) #define write(f, b, c) write((f), (b), (unsigned int)(c))
#endif #endif
@ -100,7 +100,7 @@ int main(int argc, char *argv[])
libssh2_struct_stat_size got = 0; libssh2_struct_stat_size got = 0;
libssh2_struct_stat_size total = 0; libssh2_struct_stat_size total = 0;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -285,7 +285,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/scp_write.c
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
char *ptr; char *ptr;
struct stat fileinfo; struct stat fileinfo;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -211,7 +211,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/scp_write_nonblock.c
View File

@ -81,7 +81,7 @@ int main(int argc, char *argv[])
int duration; int duration;
size_t prev; size_t prev;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -271,7 +271,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

6
example/sftp.c
View File

@ -14,7 +14,7 @@
#include <libssh2.h> #include <libssh2.h>
#include <libssh2_sftp.h> #include <libssh2_sftp.h>
#ifdef WIN32 #ifdef _WIN32
#define write(f, b, c) write((f), (b), (unsigned int)(c)) #define write(f, b, c) write((f), (b), (unsigned int)(c))
#endif #endif
@ -101,7 +101,7 @@ int main(int argc, char *argv[])
LIBSSH2_SFTP *sftp_session; LIBSSH2_SFTP *sftp_session;
LIBSSH2_SFTP_HANDLE *sftp_handle; LIBSSH2_SFTP_HANDLE *sftp_handle;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -294,7 +294,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

6
example/sftp_RW_nonblock.c
View File

@ -14,7 +14,7 @@
#include <libssh2.h> #include <libssh2.h>
#include <libssh2_sftp.h> #include <libssh2_sftp.h>
#ifdef WIN32 #ifdef _WIN32
#define write(f, b, c) write((f), (b), (unsigned int)(c)) #define write(f, b, c) write((f), (b), (unsigned int)(c))
#endif #endif
@ -85,7 +85,7 @@ int main(int argc, char *argv[])
fd_set fd; fd_set fd;
fd_set fd2; fd_set fd2;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -342,7 +342,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftp_append.c
View File

@ -54,7 +54,7 @@ int main(int argc, char *argv[])
ssize_t nwritten; ssize_t nwritten;
char *ptr; char *ptr;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -231,7 +231,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftp_mkdir.c
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
LIBSSH2_SESSION *session = NULL; LIBSSH2_SESSION *session = NULL;
LIBSSH2_SFTP *sftp_session; LIBSSH2_SFTP *sftp_session;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -172,7 +172,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftp_mkdir_nonblock.c
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
LIBSSH2_SESSION *session = NULL; LIBSSH2_SESSION *session = NULL;
LIBSSH2_SFTP *sftp_session; LIBSSH2_SFTP *sftp_session;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -171,7 +171,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

6
example/sftp_nonblock.c
View File

@ -14,7 +14,7 @@
#include <libssh2.h> #include <libssh2.h>
#include <libssh2_sftp.h> #include <libssh2_sftp.h>
#ifdef WIN32 #ifdef _WIN32
#define write(f, b, c) write((f), (b), (unsigned int)(c)) #define write(f, b, c) write((f), (b), (unsigned int)(c))
#endif #endif
@ -100,7 +100,7 @@ int main(int argc, char *argv[])
libssh2_struct_stat_size total = 0; libssh2_struct_stat_size total = 0;
int spin = 0; int spin = 0;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -288,7 +288,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftp_write.c
View File

@ -53,7 +53,7 @@ int main(int argc, char *argv[])
ssize_t nwritten; ssize_t nwritten;
char *ptr; char *ptr;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -215,7 +215,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftp_write_nonblock.c
View File

@ -87,7 +87,7 @@ int main(int argc, char *argv[])
libssh2_struct_stat_size total = 0; libssh2_struct_stat_size total = 0;
int duration; int duration;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -273,7 +273,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftp_write_sliding.c
View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[])
libssh2_struct_stat_size total = 0; libssh2_struct_stat_size total = 0;
int duration; int duration;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -284,7 +284,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftpdir.c
View File

@ -74,7 +74,7 @@ int main(int argc, char *argv[])
LIBSSH2_SFTP *sftp_session; LIBSSH2_SFTP *sftp_session;
LIBSSH2_SFTP_HANDLE *sftp_handle; LIBSSH2_SFTP_HANDLE *sftp_handle;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -295,7 +295,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/sftpdir_nonblock.c
View File

@ -53,7 +53,7 @@ int main(int argc, char *argv[])
LIBSSH2_SFTP *sftp_session; LIBSSH2_SFTP *sftp_session;
LIBSSH2_SFTP_HANDLE *sftp_handle; LIBSSH2_SFTP_HANDLE *sftp_handle;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -235,7 +235,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/ssh2.c
View File

@ -71,7 +71,7 @@ int main(int argc, char *argv[])
LIBSSH2_SESSION *session = NULL; LIBSSH2_SESSION *session = NULL;
LIBSSH2_CHANNEL *channel; LIBSSH2_CHANNEL *channel;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -341,7 +341,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/ssh2_agent.c
View File

@ -44,7 +44,7 @@ int main(int argc, char *argv[])
LIBSSH2_AGENT *agent = NULL; LIBSSH2_AGENT *agent = NULL;
struct libssh2_agent_publickey *identity, *prev_identity = NULL; struct libssh2_agent_publickey *identity, *prev_identity = NULL;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -238,7 +238,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/ssh2_agent_forwarding.c
View File

@ -80,7 +80,7 @@ int main(int argc, char *argv[])
char *exitsignal = (char *)"none"; char *exitsignal = (char *)"none";
ssize_t bytecount = 0; ssize_t bytecount = 0;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -285,7 +285,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/ssh2_echo.c
View File

@ -80,7 +80,7 @@ int main(int argc, char *argv[])
LIBSSH2_KNOWNHOSTS *nh; LIBSSH2_KNOWNHOSTS *nh;
int type; int type;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -356,7 +356,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/ssh2_exec.c
View File

@ -83,7 +83,7 @@ int main(int argc, char *argv[])
LIBSSH2_KNOWNHOSTS *nh; LIBSSH2_KNOWNHOSTS *nh;
int type; int type;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -294,7 +294,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

4
example/subsystem_netconf.c
View File

@ -112,7 +112,7 @@ int main(int argc, char *argv[])
ssize_t len; ssize_t len;
libssh2_socket_t sock; libssh2_socket_t sock;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -291,7 +291,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

8
example/tcpip-forward.c
View File

@ -6,7 +6,7 @@
#include "libssh2_setup.h" #include "libssh2_setup.h"
#include <libssh2.h> #include <libssh2.h>
#ifdef WIN32 #ifdef _WIN32
#include <ws2tcpip.h> /* for socklen_t */ #include <ws2tcpip.h> /* for socklen_t */
#define recv(s, b, l, f) recv((s), (b), (int)(l), (f)) #define recv(s, b, l, f) recv((s), (b), (int)(l), (f))
#define send(s, b, l, f) send((s), (b), (int)(l), (f)) #define send(s, b, l, f) send((s), (b), (int)(l), (f))
@ -73,7 +73,7 @@ int main(int argc, char *argv[])
libssh2_socket_t sock; libssh2_socket_t sock;
libssh2_socket_t forwardsock = LIBSSH2_INVALID_SOCKET; libssh2_socket_t forwardsock = LIBSSH2_INVALID_SOCKET;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -306,7 +306,7 @@ shutdown:
if(forwardsock != LIBSSH2_INVALID_SOCKET) { if(forwardsock != LIBSSH2_INVALID_SOCKET) {
shutdown(forwardsock, 2); shutdown(forwardsock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(forwardsock); closesocket(forwardsock);
#else #else
close(forwardsock); close(forwardsock);
@ -326,7 +326,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2); shutdown(sock, 2);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);

2
src/agent.c
View File

@ -53,7 +53,7 @@
#undef PF_UNIX #undef PF_UNIX
#endif #endif
#if defined(WIN32) && !defined(LIBSSH2_WINDOWS_UWP) #if defined(_WIN32) && !defined(LIBSSH2_WINDOWS_UWP)
#define HAVE_WIN32_AGENTS #define HAVE_WIN32_AGENTS
#endif #endif

8
src/libssh2_priv.h
View File

@ -86,7 +86,7 @@
#include "libssh2_sftp.h" #include "libssh2_sftp.h"
#include "misc.h" #include "misc.h"
#ifdef WIN32 #ifdef _WIN32
/* Detect Windows App environment which has a restricted access /* Detect Windows App environment which has a restricted access
to the Win32 APIs. */ to the Win32 APIs. */
# if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \ # if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \
@ -134,7 +134,7 @@ int _libssh2_gettimeofday(struct timeval *tp, void *tzp);
#endif #endif
/* 3DS doesn't seem to have iovec */ /* 3DS doesn't seem to have iovec */
#if defined(WIN32) || defined(_3DS) #if defined(_WIN32) || defined(_3DS)
struct iovec { struct iovec {
size_t iov_len; size_t iov_len;
@ -1204,12 +1204,12 @@ size_t plain_method(char *method, size_t method_len);
/* In Windows the default file mode is text but an application can override it. /* In Windows the default file mode is text but an application can override it.
Therefore we specify it explicitly. https://github.com/curl/curl/pull/258 Therefore we specify it explicitly. https://github.com/curl/curl/pull/258
*/ */
#if defined(WIN32) || defined(MSDOS) #if defined(_WIN32) || defined(MSDOS)
#define FOPEN_READTEXT "rt" #define FOPEN_READTEXT "rt"
#define FOPEN_WRITETEXT "wt" #define FOPEN_WRITETEXT "wt"
#define FOPEN_APPENDTEXT "at" #define FOPEN_APPENDTEXT "at"
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
/* Cygwin has specific behavior we need to address when WIN32 is not defined. /* Cygwin has specific behavior we need to address when _WIN32 is not defined.
https://cygwin.com/cygwin-ug-net/using-textbinary.html https://cygwin.com/cygwin-ug-net/using-textbinary.html
For write we want our output to have line endings of LF and be compatible For write we want our output to have line endings of LF and be compatible
with other Cygwin utilities. For read we want to handle input that may have with other Cygwin utilities. For read we want to handle input that may have

10
src/libssh2_setup.h
View File

@ -9,10 +9,6 @@
/* Header for platform/compiler-specific initialization. /* Header for platform/compiler-specific initialization.
Used by 'src', 'example', 'tests' */ Used by 'src', 'example', 'tests' */
#if defined(_WIN32) && !defined(WIN32)
#define WIN32
#endif
/* Define mingw-w64 version macros, eg __MINGW{32,64}_{MINOR,MAJOR}_VERSION */ /* Define mingw-w64 version macros, eg __MINGW{32,64}_{MINOR,MAJOR}_VERSION */
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <_mingw.h> #include <_mingw.h>
@ -26,7 +22,7 @@
/* Hand-crafted configuration for platforms which lack config tool. /* Hand-crafted configuration for platforms which lack config tool.
Keep this synced with root CMakeLists.txt */ Keep this synced with root CMakeLists.txt */
#elif defined(WIN32) #elif defined(_WIN32)
#define HAVE_SELECT #define HAVE_SELECT
#define HAVE_SNPRINTF #define HAVE_SNPRINTF
@ -54,7 +50,7 @@
/* Below applies to both auto-detected and hand-crafted configs */ /* Below applies to both auto-detected and hand-crafted configs */
#ifdef WIN32 #ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -103,6 +99,6 @@
# endif # endif
#endif #endif
#endif /* WIN32 */ #endif /* _WIN32 */
#endif /* LIBSSH2_SETUP_H */ #endif /* LIBSSH2_SETUP_H */

10
src/misc.c
View File

@ -48,7 +48,7 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#ifdef WIN32 #ifdef _WIN32
/* Force parameter type. */ /* Force parameter type. */
#define recv(s, b, l, f) recv((s), (b), (int)(l), (f)) #define recv(s, b, l, f) recv((s), (b), (int)(l), (f))
#define send(s, b, l, f) send((s), (b), (int)(l), (f)) #define send(s, b, l, f) send((s), (b), (int)(l), (f))
@ -125,7 +125,7 @@ int _libssh2_error(LIBSSH2_SESSION* session, int errcode, const char *errmsg)
return _libssh2_error_flags(session, errcode, errmsg, 0); return _libssh2_error_flags(session, errcode, errmsg, 0);
} }
#ifdef WIN32 #ifdef _WIN32
static int wsa2errno(void) static int wsa2errno(void)
{ {
switch(WSAGetLastError()) { switch(WSAGetLastError()) {
@ -160,7 +160,7 @@ _libssh2_recv(libssh2_socket_t sock, void *buffer, size_t length,
(void)abstract; (void)abstract;
rc = recv(sock, buffer, length, flags); rc = recv(sock, buffer, length, flags);
#ifdef WIN32 #ifdef _WIN32
if(rc < 0) if(rc < 0)
return -wsa2errno(); return -wsa2errno();
#else #else
@ -193,7 +193,7 @@ _libssh2_send(libssh2_socket_t sock, const void *buffer, size_t length,
(void)abstract; (void)abstract;
rc = send(sock, buffer, length, flags); rc = send(sock, buffer, length, flags);
#ifdef WIN32 #ifdef _WIN32
if(rc < 0) if(rc < 0)
return -wsa2errno(); return -wsa2errno();
#else #else
@ -708,7 +708,7 @@ int _libssh2_gettimeofday(struct timeval *tp, void *tzp)
{ {
(void)tzp; (void)tzp;
if(tp) { if(tp) {
#ifdef WIN32 #ifdef _WIN32
/* Offset between 1601-01-01 and 1970-01-01 in 100 nanosec units */ /* Offset between 1601-01-01 and 1970-01-01 in 100 nanosec units */
#define _WIN32_FT_OFFSET (116444736000000000) #define _WIN32_FT_OFFSET (116444736000000000)

2
src/misc.h
View File

@ -44,7 +44,7 @@
(void)(buf); \ (void)(buf); \
(void)(size); \ (void)(size); \
} while(0) } while(0)
#elif defined(WIN32) #elif defined(_WIN32)
#define _libssh2_explicit_zero(buf, size) SecureZeroMemory(buf, size) #define _libssh2_explicit_zero(buf, size) SecureZeroMemory(buf, size)
#elif defined(HAVE_EXPLICIT_BZERO) #elif defined(HAVE_EXPLICIT_BZERO)
#define _libssh2_explicit_zero(buf, size) explicit_bzero(buf, size) #define _libssh2_explicit_zero(buf, size) explicit_bzero(buf, size)

8
src/session.c
View File

@ -41,7 +41,7 @@
#include "libssh2_priv.h" #include "libssh2_priv.h"
#ifdef WIN32 #ifdef _WIN32
#include <ws2tcpip.h> /* for socklen_t */ #include <ws2tcpip.h> /* for socklen_t */
#endif #endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
@ -60,7 +60,7 @@
#include "channel.h" #include "channel.h"
#include "mac.h" #include "mac.h"
#if defined(WIN32) #if defined(_WIN32)
#define libssh2_usec_t long #define libssh2_usec_t long
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define libssh2_usec_t suseconds_t #define libssh2_usec_t suseconds_t
@ -313,7 +313,7 @@ session_nonblock(libssh2_socket_t sockfd, /* operate on this */
/* BeOS */ /* BeOS */
long b = nonblock ? 1 : 0; long b = nonblock ? 1 : 0;
return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b)); return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
#elif defined(WIN32) #elif defined(_WIN32)
unsigned long flags; unsigned long flags;
flags = nonblock; flags = nonblock;
@ -366,7 +366,7 @@ get_socket_nonblocking(libssh2_socket_t sockfd)
return 1; return 1;
} }
return 0; return 0;
#elif defined(WIN32) #elif defined(_WIN32)
unsigned int option_value; unsigned int option_value;
socklen_t option_len = sizeof(option_value); socklen_t option_len = sizeof(option_value);

12
tests/openssh_fixture.c
View File

@ -58,7 +58,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <ctype.h> #include <ctype.h>
#if defined(WIN32) && defined(_WIN64) #if defined(_WIN32) && defined(_WIN64)
#define LIBSSH2_SOCKET_MASK "%lld" #define LIBSSH2_SOCKET_MASK "%lld"
#else #else
#define LIBSSH2_SOCKET_MASK "%d" #define LIBSSH2_SOCKET_MASK "%d"
@ -67,7 +67,7 @@
#ifdef LIBSSH2_WINDOWS_UWP #ifdef LIBSSH2_WINDOWS_UWP
#define popen(x, y) (NULL) #define popen(x, y) (NULL)
#define pclose(x) (-1) #define pclose(x) (-1)
#elif defined(WIN32) #elif defined(_WIN32)
#define popen _popen #define popen _popen
#define pclose _pclose #define pclose _pclose
#endif #endif
@ -232,7 +232,7 @@ static const char *docker_machine_name(void)
static int is_running_inside_a_container(void) static int is_running_inside_a_container(void)
{ {
#ifdef WIN32 #ifdef _WIN32
return 0; return 0;
#else #else
const char *cgroup_filename = "/proc/self/cgroup"; const char *cgroup_filename = "/proc/self/cgroup";
@ -260,7 +260,7 @@ static int is_running_inside_a_container(void)
static void portable_sleep(unsigned int seconds) static void portable_sleep(unsigned int seconds)
{ {
#ifdef WIN32 #ifdef _WIN32
Sleep(seconds); Sleep(seconds);
#else #else
sleep(seconds); sleep(seconds);
@ -426,7 +426,7 @@ static void close_socket_to_container(libssh2_socket_t sock)
{ {
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2 /* SHUT_RDWR */); shutdown(sock, 2 /* SHUT_RDWR */);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);
@ -439,7 +439,7 @@ static char *running_container_id = NULL;
int start_openssh_fixture(void) int start_openssh_fixture(void)
{ {
int ret; int ret;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
ret = WSAStartup(MAKEWORD(2, 0), &wsadata); ret = WSAStartup(MAKEWORD(2, 0), &wsadata);

4
tests/session_fixture.c
View File

@ -252,7 +252,7 @@ void stop_session_fixture(void)
#define NUMPATHS 32 #define NUMPATHS 32
const char *srcdir_path(const char *file) const char *srcdir_path(const char *file)
{ {
#ifdef WIN32 #ifdef _WIN32
static char filepath[NUMPATHS][_MAX_PATH]; static char filepath[NUMPATHS][_MAX_PATH];
#else #else
static char filepath[NUMPATHS][MAXPATHLEN]; static char filepath[NUMPATHS][MAXPATHLEN];
@ -458,7 +458,7 @@ int test_auth_pubkey(LIBSSH2_SESSION *session, int flags,
/* Ignore our hard-wired Dockerfile user when not running under Docker */ /* Ignore our hard-wired Dockerfile user when not running under Docker */
if(!openssh_fixture_have_docker() && strcmp(username, "libssh2") == 0) { if(!openssh_fixture_have_docker() && strcmp(username, "libssh2") == 0) {
username = getenv("USER"); username = getenv("USER");
#ifdef WIN32 #ifdef _WIN32
if(!username) if(!username)
username = getenv("USERNAME"); username = getenv("USERNAME");
#endif #endif

2
tests/test_read.c
View File

@ -38,7 +38,7 @@ int test(LIBSSH2_SESSION *session)
/* Ignore our hard-wired Dockerfile user when not running under Docker */ /* Ignore our hard-wired Dockerfile user when not running under Docker */
if(!openssh_fixture_have_docker()) { if(!openssh_fixture_have_docker()) {
username = getenv("USER"); username = getenv("USER");
#ifdef WIN32 #ifdef _WIN32
if(!username) if(!username)
username = getenv("USERNAME"); username = getenv("USERNAME");
#endif #endif

8
tests/test_ssh2.c
View File

@ -33,7 +33,7 @@ static const char *password = "password";
static void portable_sleep(unsigned int seconds) static void portable_sleep(unsigned int seconds)
{ {
#ifdef WIN32 #ifdef _WIN32
Sleep(seconds); Sleep(seconds);
#else #else
sleep(seconds); sleep(seconds);
@ -53,7 +53,7 @@ int main(int argc, char *argv[])
LIBSSH2_CHANNEL *channel; LIBSSH2_CHANNEL *channel;
int counter; int counter;
#ifdef WIN32 #ifdef _WIN32
WSADATA wsadata; WSADATA wsadata;
rc = WSAStartup(MAKEWORD(2, 0), &wsadata); rc = WSAStartup(MAKEWORD(2, 0), &wsadata);
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
if(getenv("USER")) if(getenv("USER"))
username = getenv("USER"); username = getenv("USER");
#ifdef WIN32 #ifdef _WIN32
else if(getenv("USERNAME")) else if(getenv("USERNAME"))
username = getenv("USERNAME"); username = getenv("USERNAME");
#endif #endif
@ -254,7 +254,7 @@ shutdown:
if(sock != LIBSSH2_INVALID_SOCKET) { if(sock != LIBSSH2_INVALID_SOCKET) {
shutdown(sock, 2 /* SHUT_RDWR */); shutdown(sock, 2 /* SHUT_RDWR */);
#ifdef WIN32 #ifdef _WIN32
closesocket(sock); closesocket(sock);
#else #else
close(sock); close(sock);