CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-zephyr.c

diff --git a/print-zephyr.c b/print-zephyr.c
index b3d897e0db8a32815655b7158dbb543cf10e6c87..796f4e93f79c8dbac4b51f8a350f66f1b6b75815 100644 (file)
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -22,9 +22,7 @@
 
 /* \summary: Zephyr printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -140,8 +138,7 @@ str_to_lower(const char *string)
 }
 
 #define ZEPHYR_PRINT(str1,str2) \
-ND_PRINT("%s", str1); \
-fn_print_str(ndo, (const u_char *)str2);
+{ ND_PRINT("%s", (str1)); fn_print_str(ndo, (const u_char *)(str2)); }
 
 void
 zephyr_print(netdissect_options *ndo, const u_char *cp, u_int length)