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

Removed I2_PLATFORM* macros.

This commit is contained in:
Gunnar Beutner 2012-07-12 16:12:19 +02:00
parent 746400afe5
commit ff3259eee6
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/i2-base.h
View File

@ -61,14 +61,9 @@
# include "config.h" # include "config.h"
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#define PLATFORM_WINDOWS 1
#define PLATFORM_UNIX 2
#ifdef _WIN32 #ifdef _WIN32
# define I2_PLATFORM PLATFORM_WINDOWS
# include "win32.h" # include "win32.h"
#else #else
# define I2_PLATFORM PLATFORM_UNIX
# include "unix.h" # include "unix.h"
#endif #endif

4
base/unix.cpp
View File

@ -17,9 +17,9 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
#ifndef _WIN32
#include "i2-base.h" #include "i2-base.h"
#if I2_PLATFORM == PLATFORM_UNIX
#include <ltdl.h> #include <ltdl.h>
using namespace icinga; using namespace icinga;
@ -44,4 +44,4 @@ void closesocket(SOCKET fd)
close(fd); close(fd);
} }
#endif /* I2_PLATFORM == PLATFORM_UNIX */ #endif /* _WIN32 */

5
base/win32.cpp
View File

@ -17,12 +17,11 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
#ifdef _WIN32
#include "i2-base.h" #include "i2-base.h"
#if I2_PLATFORM == PLATFORM_WINDOWS
using namespace icinga; using namespace icinga;
/* nothing here (yet) */ /* nothing here (yet) */
#endif /* I2_PLATFORM == PLATFORM_WINDOWS */ #endif /* _WIN32 */