From 23818b99007966edb8967277721116e98233950f Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Thu, 27 Oct 2011 18:47:54 +0000
Subject: [PATCH] Adds a define to enable paswstring

git-svn-id: trunk@33117 -
---
 lcl/include/lcl_defines.inc | 3 ++-
 lcl/lclproc.pas             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lcl/include/lcl_defines.inc b/lcl/include/lcl_defines.inc
index 33916c0223..675a971f66 100644
--- a/lcl/include/lcl_defines.inc
+++ b/lcl/include/lcl_defines.inc
@@ -2,7 +2,8 @@
 {$define UseCLDefault}
 
 // For Android, otherwise the LCL will dependent on libc
-{$IFDEF Android}
+{$IF defined(Android)}//defined(CPUARM) and defined(LINUX)}
   {$DEFINE DisableCWString}
   {$DEFINE DisableIconv}
+  {$DEFINE EnablePasWString}
 {$ENDIF}
diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas
index c3cbe8681e..9fbd54cfc1 100644
--- a/lcl/lclproc.pas
+++ b/lcl/lclproc.pas
@@ -34,6 +34,7 @@ uses
   {$IFDEF Darwin}MacOSAll, {$ENDIF}
   Classes, SysUtils, Math, TypInfo, Types, FPCAdds, AvgLvlTree, FileUtil,
   LCLStrConsts, LCLType, WSReferences, LazUTF8
+  {$IFDEF EnablePasWString}, paswstring{$ENDIF}
   {$IFNDEF DisableCWString}{$ifdef unix}{$ifndef DisableIconv}, cwstring{$endif}{$endif}{$ENDIF}
   ;