From df3662bf3ac0d071b6f0b2d4e5bd45942667e75e Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Thu, 7 Dec 2006 16:07:42 +0000 Subject: Fix coredump on 64bit Solaris. Also adds more error conditions and moves swap specific includes out of common.h (Duncan Ferguson - 1588031) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1546 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/common.h | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'plugins/common.h') diff --git a/plugins/common.h b/plugins/common.h index ac3b8339..b3357431 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -36,6 +36,12 @@ #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 @@ -114,27 +120,6 @@ #include #endif -/* Fixes "Cannot use swapctl in the large files compilation environment" error on Solaris */ -#ifdef _FILE_OFFSET_BITS -#undef _FILE_OFFSET_BITS -#endif - -#ifdef HAVE_DECL_SWAPCTL -# ifdef HAVE_SYS_SWAP_H -# include -# endif -# ifdef HAVE_SYS_STAT_H -# include -# endif -# ifdef HAVE_SYS_PARAM_H -# include -# endif -#endif - -#ifndef SWAP_CONVERSION -# define SWAP_CONVERSION 1 -#endif - #ifdef HAVE_SYS_POLL_H # include "sys/poll.h" #endif -- cgit v1.2.3