From 2f0f1dcd645076bd119432eba787a2696c1c85ba Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 25 Sep 2012 15:45:19 +0200
Subject: [PATCH] Removed win32.cpp / unix.cpp files as they were no longer
 needed.

---
 lib/base/Makefile.am  |  2 --
 lib/base/base.vcxproj |  4 +---
 lib/base/unix.cpp     | 36 ------------------------------------
 lib/base/unix.h       |  2 +-
 lib/base/win32.cpp    | 27 ---------------------------
 5 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 lib/base/unix.cpp
 delete mode 100644 lib/base/win32.cpp

diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index 6a19ac323..f7fed226c 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -54,13 +54,11 @@ libbase_la_SOURCES =  \
 	timer.h \
 	tlsclient.cpp \
 	tlsclient.h \
-	unix.cpp \
 	unix.h \
 	utility.cpp \
 	utility.h \
 	value.cpp \
 	value.h \
-	win32.cpp \
 	win32.h
 
 libbase_la_CPPFLAGS = \
diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj
index 155a1e963..f3620d621 100644
--- a/lib/base/base.vcxproj
+++ b/lib/base/base.vcxproj
@@ -48,10 +48,8 @@
     <ClCompile Include="tcpsocket.cpp" />
     <ClCompile Include="timer.cpp" />
     <ClCompile Include="tlsclient.cpp" />
-    <ClCompile Include="unix.cpp" />
     <ClCompile Include="utility.cpp" />
     <ClCompile Include="value.cpp" />
-    <ClCompile Include="win32.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application.h" />
@@ -242,4 +240,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/base/unix.cpp b/lib/base/unix.cpp
deleted file mode 100644
index 010c390a0..000000000
--- a/lib/base/unix.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * 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 _WIN32
-
-using namespace icinga;
-
-/**
- * Closes a socket.
- *
- * @param fd The socket that is to be closed.
- */
-void closesocket(SOCKET fd)
-{
-	close(fd);
-}
-
-#endif /* _WIN32 */
diff --git a/lib/base/unix.h b/lib/base/unix.h
index bc1f59e32..e1f8e0bd7 100644
--- a/lib/base/unix.h
+++ b/lib/base/unix.h
@@ -39,8 +39,8 @@
 
 typedef int SOCKET;
 #define INVALID_SOCKET (-1)
-void closesocket(SOCKET fd);
 
+#define closesocket close
 #define ioctlsocket ioctl
 
 #ifndef MAXPATHLEN
diff --git a/lib/base/win32.cpp b/lib/base/win32.cpp
deleted file mode 100644
index 51dbadc90..000000000
--- a/lib/base/win32.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * 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"
-
-#ifdef _WIN32
-using namespace icinga;
-
-/* nothing here (yet) */
-
-#endif /* _WIN32 */