From dc2ec71d22943a02058f1944e05e4f5c8db15f88 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Tue, 11 Mar 2008 00:10:23 +0000 Subject: Fixed link -m64 problems on pst3 for solaris. Fixed _FILE_OFFSET_BITS redefinition warnings. Fixed helper ar error in ./configure git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1938 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/check_http.c | 3 +-- plugins/check_smtp.c | 4 ++-- plugins/common.h | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/check_http.c b/plugins/check_http.c index 151eacac..b3d2ae39 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -41,12 +41,11 @@ const char *revision = "$Revision$"; const char *copyright = "1999-2008"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; -#include - #include "common.h" #include "netutils.h" #include "utils.h" #include "base64.h" +#include #define INPUT_DELIMITER ";" diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 3310bceb..97208b05 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -36,13 +36,13 @@ const char *revision = "$Revision$"; const char *copyright = "2000-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; -#include - #include "common.h" #include "netutils.h" #include "utils.h" #include "base64.h" +#include + #ifdef HAVE_SSL int check_cert = FALSE; int days_till_exp; diff --git a/plugins/common.h b/plugins/common.h index 39a28a9d..0711dbf1 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -35,12 +35,6 @@ #define _COMMON_H_ #include "config.h" -/* This needs to be removed for Solaris servers, where 64 bit files, but 32 bit architecture - This needs to be done early on because subsequent system includes use _FILE_OFFSET_BITS - Cannot remove from config.h because is included by regex.c from lib/ */ -#if __sun__ && !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#undef _FILE_OFFSET_BITS -#endif #ifdef HAVE_FEATURES_H #include -- cgit v1.2.3-74-g34f1