From 37f0f92e4ceee0ec2482716d783868e0db32980f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Thu, 5 Mar 2020 19:31:00 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@902
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src_main/core/pichar.cpp   | 7 +++----
 src_main/core/pistring.cpp | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src_main/core/pichar.cpp b/src_main/core/pichar.cpp
index df23c67f..7a283e5e 100644
--- 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
-#    include <stringapiset.h>
-#  endif
+#endif
+#ifdef WINDOWS
+#  include <stringapiset.h>
 #endif
 char * __syslocname__ = 0;
 char * __sysoemname__ = 0;
diff --git a/src_main/core/pistring.cpp b/src_main/core/pistring.cpp
index c7d042ec..82bd257d 100755
--- 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
-#    include <stringapiset.h>
-#  endif
+#endif
+#ifdef WINDOWS
+#  include <stringapiset.h>
 #endif
 #include <wchar.h>
 #ifdef ANDROID