Merge pull request #2618 from ajssmith/amqp1_dev1_branch

[collectd.git] / src / daemon / globals.h

diff --git a/src/daemon/globals.h b/src/daemon/globals.h
index b4eb5f6..5a277c0 100644 (file)
--- a/src/daemon/globals.h
+++ b/src/daemon/globals.h
@@ -1,6 +1,6 @@
 /**
  * collectd - src/globals.h
- * Copyright (C) 2017  Florian octo Forster
+ * Copyright (C) 2017  Google LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,22 +26,22 @@
 
 #include <inttypes.h>
 
-#if HAVE_KSTAT_H
-#include <kstat.h>
-#endif
-
 #ifndef DATA_MAX_NAME_LEN
 #define DATA_MAX_NAME_LEN 128
 #endif
 
+#ifndef PRIsz
+#define PRIsz "zu"
+#endif /* PRIsz */
+
 /* Type for time as used by "utils_time.h" */
 typedef uint64_t cdtime_t;
 
 /* hostname_set updates hostname_g */
 void hostname_set(char const *hostname);
 
-extern char       *hostname_g;
-extern cdtime_t   interval_g;
-extern int        pidfile_from_cli;
-extern int        timeout_g;
+extern char *hostname_g;
+extern cdtime_t interval_g;
+extern int pidfile_from_cli;
+extern int timeout_g;
 #endif /* GLOBALS_H */