Commit 4351d6d0ad7d0e143874f8ed27cf8668c73294e1
1 parent
027b213b
Exists in
master
and in
3 other branches
Fixing lib3270 main header for msvc
Showing
1 changed file
with
2 additions
and
7 deletions
Show diff stats
src/include/lib3270.h
@@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
51 | 51 | ||
52 | #define LIB3270_DEPRECATED(func) func __attribute__ ((deprecated)) | 52 | #define LIB3270_DEPRECATED(func) func __attribute__ ((deprecated)) |
53 | 53 | ||
54 | - #elif defined(_WIN32) | 54 | + #elif defined(_WIN32) && !defined(_MSC_VER) |
55 | 55 | ||
56 | #define LIB3270_DEPRECATED(func) __declspec(deprecated) func | 56 | #define LIB3270_DEPRECATED(func) __declspec(deprecated) func |
57 | 57 | ||
@@ -66,16 +66,11 @@ | @@ -66,16 +66,11 @@ | ||
66 | #define LIB3270_GNUC_FORMAT(s,f) __attribute__ ((__format__ (__printf__, s, f))) | 66 | #define LIB3270_GNUC_FORMAT(s,f) __attribute__ ((__format__ (__printf__, s, f))) |
67 | #define LIB3270_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) | 67 | #define LIB3270_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) |
68 | 68 | ||
69 | - #elif defined(_WIN32) | 69 | + #elif defined(_WIN32) && !defined(_MSC_VER) |
70 | 70 | ||
71 | #define LIB3270_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) | 71 | #define LIB3270_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) |
72 | #define LIB3270_GNUC_FORMAT(s,f) | 72 | #define LIB3270_GNUC_FORMAT(s,f) |
73 | 73 | ||
74 | - #elif defined(__LCLINT__) | ||
75 | - | ||
76 | - #define LIB3270_GNUC_NULL_TERMINATED | ||
77 | - #define LIB3270_GNUC_FORMAT(s,f) | ||
78 | - | ||
79 | #else | 74 | #else |
80 | 75 | ||
81 | #define LIB3270_GNUC_NULL_TERMINATED | 76 | #define LIB3270_GNUC_NULL_TERMINATED |