From 4351d6d0ad7d0e143874f8ed27cf8668c73294e1 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 17 Oct 2019 13:22:02 -0300 Subject: [PATCH] Fixing lib3270 main header for msvc --- src/include/lib3270.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/include/lib3270.h b/src/include/lib3270.h index f9b59f2..7ad42c0 100644 --- a/src/include/lib3270.h +++ b/src/include/lib3270.h @@ -51,7 +51,7 @@ #define LIB3270_DEPRECATED(func) func __attribute__ ((deprecated)) - #elif defined(_WIN32) + #elif defined(_WIN32) && !defined(_MSC_VER) #define LIB3270_DEPRECATED(func) __declspec(deprecated) func @@ -66,16 +66,11 @@ #define LIB3270_GNUC_FORMAT(s,f) __attribute__ ((__format__ (__printf__, s, f))) #define LIB3270_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) - #elif defined(_WIN32) + #elif defined(_WIN32) && !defined(_MSC_VER) #define LIB3270_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) #define LIB3270_GNUC_FORMAT(s,f) - #elif defined(__LCLINT__) - - #define LIB3270_GNUC_NULL_TERMINATED - #define LIB3270_GNUC_FORMAT(s,f) - #else #define LIB3270_GNUC_NULL_TERMINATED -- libgit2 0.21.2