git-svn-id: svn://db.shs.com.ru/pip@902 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2020-03-05 19:31:00 +00:00
parent 5c6d9feb3d
commit 37f0f92e4c
2 changed files with 6 additions and 8 deletions
--- a/src_main/core/pichar.cpp
+++ b/src_main/core/pichar.cpp
@@ -26,10 +26,9 @@
 #  define U_NOEXCEPT
 #  include "unicode/ucnv.h"
 #  include "unicode/ustring.h"
-#else
-#  ifdef WINDOWS
+#endif
+#ifdef WINDOWS
 #  include <stringapiset.h>
-#  endif
 #endif
 char * __syslocname__ = 0;
 char * __sysoemname__ = 0;
--- a/src_main/core/pistring.cpp
+++ b/src_main/core/pistring.cpp
@@ -21,10 +21,9 @@
 #ifdef PIP_ICU
 #  define U_NOEXCEPT
 #  include "unicode/ucnv.h"
-#else
-#  ifdef WINDOWS
+#endif
+#ifdef WINDOWS
 #  include <stringapiset.h>
-#  endif
 #endif
 #include <wchar.h>
 #ifdef ANDROID