Get rid of various old compiler and platform checks

[irrlicht.git] / source / Irrlicht / COSOperator.cpp

diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
index 7824e677f1395489204fc89b278222b4f7692682..a6f9461d8a253a4eede0d8b0b481620599da5786 100644 (file)
--- a/source/Irrlicht/COSOperator.cpp
+++ b/source/Irrlicht/COSOperator.cpp
@@ -5,9 +5,7 @@
 #include "COSOperator.h"\r
 \r
 #ifdef _IRR_WINDOWS_API_\r
-#ifndef _IRR_XBOX_PLATFORM_\r
 #include <windows.h>\r
-#endif\r
 #else\r
 #include <string.h>\r
 #include <unistd.h>\r
@@ -63,8 +61,7 @@ void COSOperator::copyToClipboard(const c8 *text) const
                return;\r
 \r
 // Windows version\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL) || text == 0)\r
                return;\r
 \r
@@ -101,8 +98,6 @@ void COSOperator::copyToClipboard(const c8 *text) const
 #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
     if ( IrrDeviceLinux )\r
         IrrDeviceLinux->copyToClipboard(text);\r
-#else\r
-\r
 #endif\r
 }\r
 \r
@@ -111,9 +106,7 @@ void COSOperator::copyToClipboard(const c8 *text) const
 //! \return Returns 0 if no string is in there, otherwise an utf-8 string.\r
 const c8* COSOperator::getTextFromClipboard() const\r
 {\r
-#if defined(_IRR_XBOX_PLATFORM_)\r
-               return 0;\r
-#elif defined(_IRR_WINDOWS_API_)\r
+#if defined(_IRR_WINDOWS_API_)\r
        if (!OpenClipboard(NULL))\r
                return 0;\r
 \r
@@ -156,7 +149,7 @@ const c8* COSOperator::getTextFromClipboard() const
 \r
 bool COSOperator::getSystemMemory(u32* Total, u32* Avail) const\r
 {\r
-#if defined(_IRR_WINDOWS_API_) && !defined (_IRR_XBOX_PLATFORM_)\r
+#if defined(_IRR_WINDOWS_API_)\r
 \r
        MEMORYSTATUSEX MemoryStatusEx;\r
        MemoryStatusEx.dwLength = sizeof(MEMORYSTATUSEX);\r