Merge branch 'collectd-5.4'

[collectd.git] / src / collectd.h

diff --git a/src/collectd.h b/src/collectd.h
index f53c25d..6886c12 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -271,8 +271,16 @@ typedef int _Bool;
  # define COLLECTD_USERAGENT PACKAGE_NAME"/"PACKAGE_VERSION
  #endif
 
-/* Remove GNU specific __attribute__ settings when using another compiler */
-#if !__GNUC__
+/* Only enable __attribute__() for compilers known to support it. */
+#if defined(__clang__)
+# define clang_attr(x) __attribute__(x)
+# define gcc_attr(x) /**/
+#elif __GNUC__
+# define clang_attr(x) /**/
+# define gcc_attr(x) __attribute__(x)
+#else
+# define clang_attr(x) /**/
+# define gcc_attr(x) /**/
 # define __attribute__(x) /**/
 #endif
 
@@ -301,6 +309,7 @@ typedef uint64_t cdtime_t;
 
 extern char     hostname_g[];
 extern cdtime_t interval_g;
+extern int      pidfile_from_cli;
 extern int      timeout_g;
 
 #endif /* COLLECTD_H */