lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-07 08:02:56 +03:00
Code Activity

libssh2.h: use _WIN32 for Windows detection instead of rolling our own

Browse Source 
Sync up `libssh2.h` Windows detection with the libssh2 source code.

`libssh2.h` was using `WIN32` and `LIBSSH2_WIN32` for Windows detection,
next to the official `_WIN32`. After this patch it only uses `_WIN32`
for this. Also, make it stop defining `LIBSSH2_WIN32`.

There is a slight chance these break compatibility with Windows
compilers that fail to define `_WIN32`. I'm not aware of any obsolete
or modern compiler affected, but in case there is one, one possible
solution is to define this macro manually.

Closes #1238
This commit is contained in:
Viktor Szakats
2023-11-21 20:32:12 +00:00
parent 487152f4fa
commit 631e7734c8
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/libssh2.h
View File

@@ -90,11 +90,7 @@
extern "C" { extern "C" {
#endif #endif
#if defined(_WIN32) || defined(WIN32) #ifdef _WIN32
#define LIBSSH2_WIN32
#endif
#ifdef LIBSSH2_WIN32
# include <basetsd.h> # include <basetsd.h>
# include <winsock2.h> # include <winsock2.h>
#endif #endif
@@ -106,7 +102,7 @@ extern "C" {
/* Allow alternate API prefix from CFLAGS or calling app */ /* Allow alternate API prefix from CFLAGS or calling app */
#ifndef LIBSSH2_API #ifndef LIBSSH2_API
# ifdef LIBSSH2_WIN32 # ifdef _WIN32
# if defined(LIBSSH2_EXPORTS) || defined(_WINDLL) # if defined(LIBSSH2_EXPORTS) || defined(_WINDLL)
# ifdef LIBSSH2_LIBRARY # ifdef LIBSSH2_LIBRARY
# define LIBSSH2_API __declspec(dllexport) # define LIBSSH2_API __declspec(dllexport)
@@ -116,9 +112,9 @@ extern "C" {
# else # else
# define LIBSSH2_API # define LIBSSH2_API
# endif # endif
# else /* !LIBSSH2_WIN32 */ # else /* !_WIN32 */
# define LIBSSH2_API # define LIBSSH2_API
# endif /* LIBSSH2_WIN32 */ # endif /* _WIN32 */
#endif /* LIBSSH2_API */ #endif /* LIBSSH2_API */
#ifdef HAVE_SYS_UIO_H #ifdef HAVE_SYS_UIO_H
@@ -144,13 +140,13 @@ typedef unsigned long long libssh2_uint64_t;
typedef long long libssh2_int64_t; typedef long long libssh2_int64_t;
#endif #endif
#ifdef LIBSSH2_WIN32 #ifdef _WIN32
typedef SOCKET libssh2_socket_t; typedef SOCKET libssh2_socket_t;
#define LIBSSH2_INVALID_SOCKET INVALID_SOCKET #define LIBSSH2_INVALID_SOCKET INVALID_SOCKET
#else /* !LIBSSH2_WIN32 */ #else /* !_WIN32 */
typedef int libssh2_socket_t; typedef int libssh2_socket_t;
#define LIBSSH2_INVALID_SOCKET -1 #define LIBSSH2_INVALID_SOCKET -1
#endif /* LIBSSH2_WIN32 */ #endif /* _WIN32 */
/* /*
* Determine whether there is small or large file support on windows. * Determine whether there is small or large file support on windows.
@@ -176,7 +172,7 @@ typedef int libssh2_socket_t;
# undef LIBSSH2_USE_WIN32_LARGE_FILES # undef LIBSSH2_USE_WIN32_LARGE_FILES
#endif #endif
#if defined(LIBSSH2_WIN32) && !defined(LIBSSH2_USE_WIN32_LARGE_FILES) && \ #if defined(_WIN32) && !defined(LIBSSH2_USE_WIN32_LARGE_FILES) && \
!defined(LIBSSH2_USE_WIN32_SMALL_FILES) !defined(LIBSSH2_USE_WIN32_SMALL_FILES)
# define LIBSSH2_USE_WIN32_SMALL_FILES # define LIBSSH2_USE_WIN32_SMALL_FILES
#endif #endif

2
include/libssh2_sftp.h
View File

@@ -42,7 +42,7 @@
#include "libssh2.h" #include "libssh2.h"
#ifndef LIBSSH2_WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#endif #endif