From 3daa4fe6905b081e2a84f7236e585e486477c368 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 5 Nov 2017 19:37:42 +0100 Subject: [PATCH] prepare zipios++ for unicode support --- src/zipios++/zipfile.cpp | 4 +++- src/zipios++/zipinputstream.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/zipios++/zipfile.cpp b/src/zipios++/zipfile.cpp index 76edc1d222..6811eba518 100644 --- a/src/zipios++/zipfile.cpp +++ b/src/zipios++/zipfile.cpp @@ -9,7 +9,9 @@ #include "zipios_defs.h" #include "backbuffer.h" +#if defined(_WIN32) #include +#endif namespace zipios { @@ -34,7 +36,7 @@ ZipFile::ZipFile( const string &name , int s_off, int e_off _filename = name ; -#if _WIN32 +#if defined(_WIN32) std::wstring wsname = Base::FileInfo(name).toStdWString(); ifstream _zipfile( wsname.c_str(), ios::in | ios::binary ) ; #else diff --git a/src/zipios++/zipinputstream.cpp b/src/zipios++/zipinputstream.cpp index b048a5995c..606e9e2584 100644 --- a/src/zipios++/zipinputstream.cpp +++ b/src/zipios++/zipinputstream.cpp @@ -5,7 +5,9 @@ #include "zipinputstreambuf.h" #include "zipinputstream.h" +#if defined(_WIN32) #include +#endif using std::istream; @@ -25,7 +27,7 @@ ZipInputStream::ZipInputStream( const std::string &filename, std::streampos pos : std::istream( 0 ), ifs( 0 ) { -#if _WIN32 +#if defined(_WIN32) std::wstring wsname = Base::FileInfo(filename).toStdWString(); ifs = new std::ifstream( wsname.c_str(), std::ios::in |std:: ios::binary ) ; #else