From d468336cbbda2238c75ab2c95895701e7435f4a9 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 2 Dec 2011 20:21:18 +0000
Subject: [PATCH] lconvencoding: simplified using iconvenc, define
 EnableIconvEnc if you want to use iconvenc

git-svn-id: trunk@33916 -
---
 components/lazutils/lconvencoding.pas | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/components/lazutils/lconvencoding.pas b/components/lazutils/lconvencoding.pas
index 3aad14e2b2..fa95e63ec8 100644
--- a/components/lazutils/lconvencoding.pas
+++ b/components/lazutils/lconvencoding.pas
@@ -18,15 +18,9 @@ unit LConvEncoding;
 
 interface
 
-{$DEFINE DisableIconv}
-
-{$IFNDEF DisableIconv}
-{$IFDEF UNIX}{$IF not defined(VER2_2_0) and not defined(VER2_2_2)}{$DEFINE HasIconvEnc}{$ENDIF}{$ENDIF}
-{$ENDIF}
-
 uses
   SysUtils, Classes, dos, LazUTF8
-  {$IFDEF HasIconvEnc},iconvenc{$ENDIF};
+  {$IFDEF EnableIconvEnc},iconvenc{$ENDIF};
 const
   EncodingUTF8 = 'utf8';
   EncodingAnsi = 'ansi';
@@ -6344,7 +6338,7 @@ function ConvertEncoding(const s, FromEncoding, ToEncoding: string): string;
 var
   AFrom, ATo, SysEnc : String;
   Encoded : Boolean;
-  {$ifdef HasIconvEnc}
+  {$ifdef EnableIconvEnc}
   Dummy: String;
   {$endif}
 begin
@@ -6655,7 +6649,7 @@ begin
   end;
 
   Result:=s;
-  {$ifdef HasIconvEnc}
+  {$ifdef EnableIconvEnc}
   try
     if not IconvLibFound and not InitIconv(Dummy) then
     begin