- explicitly include utils_base.h from utils.h

- put utils.h inside of an #ifndef/#endif

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1474 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/lib/utils_base.h b/lib/utils_base.h
index ca27f1697f1082e4819f0279f00ecb429fa9ece3..113e3043a589518c757cd073da45785d68b3f02b 100644 (file)
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -1,3 +1,5 @@
+#ifndef _UTILS_BASE_
+#define _UTILS_BASE_
 /* Header file for nagios plugins utils_base.c */
 
 /* This file holds header information for thresholds - use this in preference to 
@@ -35,3 +37,5 @@ int get_status(double, thresholds *);
 char *np_escaped_string (const char *);
 
 void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)));
+
+#endif /* _UTILS_BASE_ */

diff --git a/plugins/utils.h b/plugins/utils.h
index 1f53aadb2f97c685cc60b488eadc540b57e7504f..0d00ce85cef9fd759b85e04c36626d1376adcdb3 100644 (file)
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -13,6 +13,9 @@ in order to resist overflow attacks. In addition, a few functions are
 provided to standardize version and error reporting across the entire
 suite of plugins. */
 
+/* now some functions etc are being defined in ../lib/utils_base.c */
+#include "utils_base.h"
+
 /* Standardize version information, termination */
 
 /* $Id$ */