Download as
Browse Code »

Commit 23df3f64c021401efbeff46f5bd243f98e935f5a

Authored by Perry Werneck
2 parents 7b8f08f0 01899acf
Exists in master and in 3 other branches develop, macos, network_module

Merge branch 'master' into CVE-2019-15525

Showing 2 changed files with 2 additions and 12 deletions   Show diff stats
@@ -257,13 +257,8 @@ install-linux-lib: \ @@ -257,13 +257,8 @@ install-linux-lib: \
257 257
258 @$(LN_S) \ 258 @$(LN_S) \
259 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 259 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
260 - $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@  
261 -  
262 - @$(LN_S) \  
263 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \  
264 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 260 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
265 261
266 -  
267 # Install default configs 262 # Install default configs
268 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270 263 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270
269 264
src/include/lib3270.h
  Diff comments   View file @23df3f6
@@ -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