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

include: delete leading underscore from macro name

It can cause compiler warnings in 3rd-party code.

Follow-up to 59666e03f0

Closes #957
This commit is contained in:
Viktor Szakats
2023-04-13 11:09:35 +00:00
parent 1ccae7d548
commit 224fffb178
2 changed files with 10 additions and 10 deletions

View File

@@ -89,10 +89,10 @@ extern "C" {
#endif #endif
#if defined(_WIN32) || defined(WIN32) #if defined(_WIN32) || defined(WIN32)
#define _LIBSSH2_WIN32 #define LIBSSH2_WIN32
#endif #endif
#ifdef _LIBSSH2_WIN32 #ifdef LIBSSH2_WIN32
# include <basetsd.h> # include <basetsd.h>
# include <winsock2.h> # include <winsock2.h>
#endif #endif
@@ -104,7 +104,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 LIBSSH2_WIN32
# if defined(LIBSSH2_EXPORTS) || defined(DLL_EXPORT) || defined(_WINDLL) # if defined(LIBSSH2_EXPORTS) || defined(DLL_EXPORT) || defined(_WINDLL)
# ifdef LIBSSH2_LIBRARY # ifdef LIBSSH2_LIBRARY
# define LIBSSH2_API __declspec(dllexport) # define LIBSSH2_API __declspec(dllexport)
@@ -114,9 +114,9 @@ extern "C" {
# else # else
# define LIBSSH2_API # define LIBSSH2_API
# endif # endif
# else /* !_LIBSSH2_WIN32 */ # else /* !LIBSSH2_WIN32 */
# define LIBSSH2_API # define LIBSSH2_API
# endif /* _LIBSSH2_WIN32 */ # endif /* LIBSSH2_WIN32 */
#endif /* LIBSSH2_API */ #endif /* LIBSSH2_API */
#ifdef HAVE_SYS_UIO_H #ifdef HAVE_SYS_UIO_H
@@ -142,13 +142,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 LIBSSH2_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 /* !LIBSSH2_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 /* LIBSSH2_WIN32 */
/* /*
* Determine whether there is small or large file support on windows. * Determine whether there is small or large file support on windows.
@@ -174,7 +174,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(LIBSSH2_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

View File

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