Skip to content

Commit cc0dc6a

Browse files
committed
Fix deprecation macros for old Sun C. [skip ci]
As Francois-Xavier points it out, my recent commit 5265743 in certain contexts adds rather than removes compiler warnings: cc: Sun C 5.12 SunOS_i386 Patch 148918-11 2017/12/13 "tcpdump.c", line 3267: warning: bad message tag: E_DEPRECATED_ATT "tcpdump.c", line 3307: warning: bad message tag: E_DEPRECATED_ATT Get Sun C versions right to fix that.
1 parent 7652b93 commit cc0dc6a

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

diag-control.h

+10-5
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,17 @@
178178
*/
179179
#elif ND_IS_AT_LEAST_SUNC_VERSION(5,5)
180180
/*
181-
* Suppress deprecation warnings.
181+
* error_messages() is a valid pragma.
182182
*/
183-
#define DIAG_OFF_DEPRECATION \
184-
DIAG_DO_PRAGMA(error_messages(off,E_DEPRECATED_ATT))
185-
#define DIAG_ON_DEPRECATION \
186-
DIAG_DO_PRAGMA(error_messages(default,E_DEPRECATED_ATT))
183+
#if ND_IS_AT_LEAST_SUNC_VERSION(5,13)
184+
/*
185+
* E_DEPRECATED_ATT is a valid warning tag.
186+
*/
187+
#define DIAG_OFF_DEPRECATION \
188+
DIAG_DO_PRAGMA(error_messages(off,E_DEPRECATED_ATT))
189+
#define DIAG_ON_DEPRECATION \
190+
DIAG_DO_PRAGMA(error_messages(default,E_DEPRECATED_ATT))
191+
#endif
187192
#endif
188193

189194
/*

0 commit comments

Comments
 (0)