summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/wireshark.h2
-rw-r--r--include/ws_attributes.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/include/wireshark.h b/include/wireshark.h
index f7c19c23..3ffa9557 100644
--- a/include/wireshark.h
+++ b/include/wireshark.h
@@ -21,7 +21,7 @@
* Other public headers provided here should be minimal, with stable interfaces
* and have only global declarations.
*
- * Everytime this header changes everything must be rebuilt so consider carefully
+ * Every time this header changes everything must be rebuilt so consider carefully
* if the other project headers included here should really have global scope.
*
* See README.developer for a more in-depth guide.
diff --git a/include/ws_attributes.h b/include/ws_attributes.h
index d004280e..4446c4ae 100644
--- a/include/ws_attributes.h
+++ b/include/ws_attributes.h
@@ -24,8 +24,7 @@ extern "C" {
*
* XXX - similar hints for other compilers?
*/
-#if defined(__GNUC__)
- /* This includes clang */
+#if defined(__GNUC__) || defined(__clang__)
#define _U_ __attribute__((unused))
#elif defined(_MSC_VER)
#define _U_ __pragma(warning(suppress:4100 4189))
@@ -119,8 +118,7 @@ extern "C" {
* useful for functions where not checking the result is either a security
* problem or always a bug, such as realloc.
*/
-#if defined(__GNUC__)
- /* This includes clang */
+#if defined(__GNUC__) || defined(__clang__)
#define WS_WARN_UNUSED __attribute__((warn_unused_result))
#else
#define WS_WARN_UNUSED