tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation errors on *NIX.

This commit is contained in:
Gunnar Beutner 2012-07-13 21:07:39 +02:00
parent 20dbad0131
commit a73f41fb6c
6 changed files with 68 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/Makefile.am
View File

@ -65,7 +65,8 @@ libbase_la_CPPFLAGS = \
$(LTDLINCL) \
$(BOOST_CPPFLAGS) \
$(OPENSSL_INCLUDES) \
-I${top_srcdir}/third-party/mmatch
-I${top_srcdir}/third-party/mmatch \
-I${top_srcdir}/third-party/popen-noshell
libbase_la_LDFLAGS = \
$(BOOST_LDFLAGS) \
@ -79,4 +80,5 @@ libbase_la_LIBADD = \
$(OPENSSL_LIBS) \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
${top_builddir}/third-party/mmatch/libmmatch.la
${top_builddir}/third-party/mmatch/libmmatch.la \
${top_builddir}/third-party/popen-noshell/libpopen_noshell.la

21
base/asynctask.h
View File

@ -1,3 +1,22 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef ASYNCTASK_H
#define ASYNCTASK_H
@ -42,7 +61,7 @@ protected:
bool m_Finished;
private:
static void FinishForwarder(typename const shared_ptr<T>& task)
static void FinishForwarder(const shared_ptr<T>& task)
{
task->OnTaskCompleted(task);
}

23
base/process.cpp
View File

@ -1,5 +1,28 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "i2-base.h"
#ifndef _MSC_VER
# include "popen_noshell.h"
#endif /* _MSC_VER */
using namespace icinga;
bool Process::m_ThreadsCreated = false;

19
base/process.h
View File

@ -1,3 +1,22 @@
/******************************************************************************
* Icinga 2 *
* Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef PROCESS_H
#define PROCESS_H

6
cib/Makefile.am
View File

@ -34,8 +34,7 @@ libcib_la_CPPFLAGS = \
-I${top_srcdir}/base \
-I${top_srcdir}/dyn \
-I${top_srcdir}/jsonrpc \
-I${top_srcdir}/icinga \
-I${top_srcdir}/third-party/popen-noshell
-I${top_srcdir}/icinga
libcib_la_LDFLAGS = \
$(BOOST_LDFLAGS) \
@ -49,5 +48,4 @@ libcib_la_LIBADD = \
${top_builddir}/base/libbase.la \
${top_builddir}/dyn/libdyn.la \
${top_builddir}/jsonrpc/libjsonrpc.la \
${top_builddir}/icinga/libicinga.la \
${top_builddir}/third-party/popen-noshell/libpopen_noshell.la
${top_builddir}/icinga/libicinga.la

4
cib/nagioschecktask.cpp
View File

@ -19,10 +19,6 @@
#include "i2-cib.h"
#ifndef _MSC_VER
# include "popen_noshell.h"
#endif /* _MSC_VER */
using namespace icinga;
NagiosCheckTask::NagiosCheckTask(const Service& service)