From ee547fe90db7b329ef76b7fb75e464b4b5591fcf Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sat, 17 May 2014 23:47:20 +0200 Subject: [PATCH] libssh2_priv msvc: Removed redundant definition of inline keyword Initially reported by Bob Kast as "Remove redundant 'inline' define". Thanks a lot. --- src/libssh2_priv.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h index 461d14c..d8b3f31 100644 --- a/src/libssh2_priv.h +++ b/src/libssh2_priv.h @@ -108,6 +108,11 @@ #define TRUE 1 #endif +#ifdef _MSC_VER +/* "inline" keyword is valid only with C++ engine! */ +#define inline __inline +#endif + /* Provide iovec / writev on WIN32 platform. */ #ifdef WIN32 @@ -116,8 +121,6 @@ struct iovec { void * iov_base; }; -#define inline __inline - static inline int writev(int sock, struct iovec *iov, int nvecs) { DWORD ret; @@ -136,11 +139,6 @@ static inline int writev(int sock, struct iovec *iov, int nvecs) #include #include -#ifdef _MSC_VER -/* "inline" keyword is valid only with C++ engine! */ -#define inline __inline -#endif - #endif /* RFC4253 section 6.1 Maximum Packet Length says: