Fix to parsing of uptime (Ronald Tin - 1254656)

[nagiosplug.git] / plugins / common.h

diff --git a/plugins/common.h b/plugins/common.h
index 2456c4176d731fec2145b72796fbe233fa2346e4..e10586bc8f4c7f077ed4de0fa6fd80537e50228b 100644 (file)
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -28,6 +28,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ * $Id$
+ *
  *****************************************************************************/
 
 #include "config.h"
@@ -40,6 +42,10 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#ifdef HUGE_VAL_NEEDS_MATH_H
+#include <math.h>
+#endif
+
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -80,7 +86,7 @@
 
 #include <ctype.h>
 
-#if HAVE_LWRES_NETDB_H
+#ifdef HAVE_LWRES_NETDB_H
 #include <lwres/netdb.h>
 #else
 # if !HAVE_GETADDRINFO
@@ -90,6 +96,26 @@
 # endif
 #endif
 
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#ifdef HAVE_DECL_SWAPCTL
+# ifdef HAVE_SYS_SWAP_H
+#  include <sys/swap.h>
+# endif
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
+# ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+# endif
+#endif
+
+#ifndef SWAP_CONVERSION
+# define SWAP_CONVERSION 1
+#endif
+
 /*
  *
  * Missing Functions
@@ -131,10 +157,13 @@ enum {
        ERROR = -1
 };
 
+/* AIX seems to have this defined somewhere else */
+#ifndef FALSE
 enum {
        FALSE,
        TRUE
 };
+#endif
 
 enum {
        STATE_OK,
@@ -155,15 +184,10 @@ enum {
  * Internationalization
  *
  */
+#include "gettext.h"
+#define _(String) gettext (String)
 
-#if ENABLE_NLS
-#  include "gettext.h"
-#  define _(String) gettext (String)
-#  define gettext_noop(String) String
-#  define N_(String) gettext_noop String
-#else
-#  define _(String) (String)
-#  define N_(String) String
-#  define textdomain(Domain)
-#  define bindtextdomain(Package, Directory)
+/* For non-GNU compilers to ignore __attribute__ */
+#ifndef __GNUC__
+# define __attribute__(x) /* do nothing */
 #endif