From 112b5b91647c3dea45cc1c9bc364df526c8012f1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jan 2022 19:05:15 +0100 Subject: Merging upstream version 1.33.0. Signed-off-by: Daniel Baumann --- collectors/timex.plugin/plugin_timex.c | 2 +- collectors/timex.plugin/plugin_timex.h | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 collectors/timex.plugin/plugin_timex.h (limited to 'collectors/timex.plugin') diff --git a/collectors/timex.plugin/plugin_timex.c b/collectors/timex.plugin/plugin_timex.c index b3e722a4c..b69f34292 100644 --- a/collectors/timex.plugin/plugin_timex.c +++ b/collectors/timex.plugin/plugin_timex.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "plugin_timex.h" +#include "daemon/common.h" #include "sys/timex.h" #define PLUGIN_TIMEX_NAME "timex.plugin" diff --git a/collectors/timex.plugin/plugin_timex.h b/collectors/timex.plugin/plugin_timex.h deleted file mode 100644 index f83786163..000000000 --- a/collectors/timex.plugin/plugin_timex.h +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later - -#ifndef NETDATA_PLUGIN_TIMEX_H -#define NETDATA_PLUGIN_TIMEX_H - -#include "daemon/common.h" - -#if (TARGET_OS == OS_LINUX) - -#define NETDATA_PLUGIN_HOOK_LINUX_TIMEX \ - { \ - .name = "PLUGIN[timex]", \ - .config_section = CONFIG_SECTION_PLUGINS, \ - .config_name = "timex", \ - .enabled = 1, \ - .thread = NULL, \ - .init_routine = NULL, \ - .start_routine = timex_main \ - }, - -extern void *timex_main(void *ptr); - -#else // (TARGET_OS == OS_LINUX) - -#define NETDATA_PLUGIN_HOOK_LINUX_TIMEX - -#endif // (TARGET_OS == OS_LINUX) - -#endif //NETDATA_PLUGIN_TIMEX_H -- cgit v1.2.3