Removed I2_PLATFORM* macros.

diff --git a/base/i2-base.h b/base/i2-base.h
index 29ee50d59c258b1c27e2bcc230c119a4c7379706..1f05082685c2ebd1bbb99a68ec02d1cf614cc60f 100644 (file)
--- a/base/i2-base.h
+++ b/base/i2-base.h
@@ -61,14 +61,9 @@
 #      include "config.h"
 #endif /* _MSC_VER */
 
-#define PLATFORM_WINDOWS 1
-#define PLATFORM_UNIX 2
-
 #ifdef _WIN32
-#      define I2_PLATFORM PLATFORM_WINDOWS
 #      include "win32.h"
 #else
-#      define I2_PLATFORM PLATFORM_UNIX
 #      include "unix.h"
 #endif
 

diff --git a/base/unix.cpp b/base/unix.cpp
index 3b074442fcd4c508eb8d5a6cebf8b37bba5aa811..83c2a864fd3cb322c04ccd054e09f92dd0d56671 100644 (file)
--- a/base/unix.cpp
+++ b/base/unix.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
+#ifndef _WIN32
 #include "i2-base.h"
 
-#if I2_PLATFORM == PLATFORM_UNIX
 #include <ltdl.h>
 
 using namespace icinga;
@@ -44,4 +44,4 @@ void closesocket(SOCKET fd)
        close(fd);
 }
 
-#endif /* I2_PLATFORM == PLATFORM_UNIX */
+#endif /* _WIN32 */

diff --git a/base/win32.cpp b/base/win32.cpp
index 5f1a66a286de30fc7572f28d21f6a0bfde94e063..9ccc89c4ce853c5b93bd8685bd6967fda97567f2 100644 (file)
--- a/base/win32.cpp
+++ b/base/win32.cpp
@@ -17,12 +17,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
+#ifdef _WIN32
 #include "i2-base.h"
 
-#if I2_PLATFORM == PLATFORM_WINDOWS
-
 using namespace icinga;
 
 /* nothing here (yet) */
 
-#endif /* I2_PLATFORM == PLATFORM_WINDOWS */
+#endif /* _WIN32 */