generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaned up MSVC ifdefs which where spreaded over 3 places.

Browse Source
This commit is contained in:
Guenter Knauf 2010-06-01 19:32:11 +02:00
parent aad74b7fa6
commit 86c935317c
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/libssh2.h
View File

@ -73,13 +73,16 @@ typedef unsigned char uint8_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
#endif #endif
#if defined(LIBSSH2_WIN32) && defined(_MSC_VER) && (_MSC_VER <= 1400) #if defined(LIBSSH2_WIN32) && defined(_MSC_VER)
typedef unsigned char uint8_t;
typedef unsigned int uint32_t;
# ifndef _SSIZE_T_DEFINED
typedef int ssize_t;
# define _SSIZE_T_DEFINED
# if (_MSC_VER <= 1400)
typedef unsigned __int64 libssh2_uint64_t; typedef unsigned __int64 libssh2_uint64_t;
typedef __int64 libssh2_int64_t; typedef __int64 libssh2_int64_t;
typedef unsigned int uint32_t; # endif
#ifndef _SSIZE_T_DEFINED
typedef int ssize_t;
#define _SSIZE_T_DEFINED
#endif #endif
#else #else
typedef unsigned long long libssh2_uint64_t; typedef unsigned long long libssh2_uint64_t;

7
src/libssh2_priv.h
View File

@ -40,13 +40,6 @@
#ifndef LIBSSH2_PRIV_H #ifndef LIBSSH2_PRIV_H
#define LIBSSH2_PRIV_H 1 #define LIBSSH2_PRIV_H 1
#ifdef _MSC_VER
typedef unsigned __int8 uint8_t;
#ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE 1
#endif /* _CRT_SECURE_NO_DEPRECATE */
#endif /* _MSC_VER */
#define LIBSSH2_LIBRARY #define LIBSSH2_LIBRARY
#include "libssh2_config.h" #include "libssh2_config.h"

7
win32/libssh2_config.h
View File

@ -19,12 +19,12 @@
#define HAVE_SELECT #define HAVE_SELECT
#ifdef _MSC_VER #ifdef _MSC_VER
#ifndef _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE 1
#endif /* _CRT_SECURE_NO_DEPRECATE */
#define snprintf _snprintf #define snprintf _snprintf
#if _MSC_VER < 1500 #if _MSC_VER < 1500
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#else
#define ssize_t SSIZE_T
#define uint32_t UINT32
#endif #endif
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define strcasecmp _stricmp #define strcasecmp _stricmp
@ -41,4 +41,3 @@
#endif /* LIBSSH2_CONFIG_H */ #endif /* LIBSSH2_CONFIG_H */