Drop obsolete configuration macros

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

diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp
index d394313d9853c79de57627f93d29099f65f87da9..500db9008dd35d0d711fbb3a408a500db0519cec 100644 (file)
--- a/source/Irrlicht/CZipReader.cpp
+++ b/source/Irrlicht/CZipReader.cpp
@@ -7,16 +7,12 @@
 #include "os.h"\r
 \r
 \r
-#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r
-\r
 #include "CFileList.h"\r
 #include "CReadFile.h"\r
 #include "coreutil.h"\r
 \r
 #include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_ZLIB_\r
-       #include <zlib.h> // use system lib\r
-#endif\r
+#include <zlib.h> // use system lib\r
 \r
 namespace irr\r
 {\r
@@ -464,8 +460,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
                }\r
        case 8:\r
                {\r
-                       #ifdef _IRR_COMPILE_WITH_ZLIB_\r
-\r
                        const u32 uncompressedSize = e.header.DataDescriptor.UncompressedSize;\r
                        c8* pBuf = new c8[ uncompressedSize ];\r
                        if (!pBuf)\r
@@ -531,10 +525,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
                        }\r
                        else\r
                                return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);\r
-\r
-                       #else\r
-                       return 0; // zlib not compiled, we cannot decompress the data.\r
-                       #endif\r
                }\r
        case 12:\r
                {\r
@@ -560,5 +550,3 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 \r
 } // end namespace io\r
 } // end namespace irr\r
-\r
-#endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_\r