From f2dc924eaaa0f6ecb487addd9a31e001ee4430bf Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 21 Oct 2016 16:46:26 +0000
Subject: [PATCH] wikisearch: fixed compilation

git-svn-id: trunk@53187 -
---
 components/wiki/lazwiki/wiki2chmconvert.pas |   2 +-
 components/wiki/test/wikihelpmanager.pas    |   4 ++++
 components/wiki/test/wikisearchdemo.res     | Bin 138128 -> 138696 bytes
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/wiki/lazwiki/wiki2chmconvert.pas b/components/wiki/lazwiki/wiki2chmconvert.pas
index f2a4bc6fc0..b4f6afa4d1 100644
--- a/components/wiki/lazwiki/wiki2chmconvert.pas
+++ b/components/wiki/lazwiki/wiki2chmconvert.pas
@@ -77,12 +77,12 @@ type
     function GetImageLink(ImgFilename: string): string; override;
     function GetInternalImageLink(ImgFilename: String): String; override;
     function GetPageLink(Page: TW2XHTMLPage): string; override;
-    function GetRelativeCSSFileName: String; override;
     procedure SaveAllPages; override;
   public
     constructor Create; override;
     destructor Destroy; override;
     procedure Clear; override;
+    function GetRelativeCSSFileName: String; override;
     property CHMFile: string read FCHMFile write SetCHMFile;
     property IndexFileName: string read FIndexFileName write SetIndexFileName;
     property TOCFileName: String read FTOCFilename write SetTOCFilename;
diff --git a/components/wiki/test/wikihelpmanager.pas b/components/wiki/test/wikihelpmanager.pas
index 2d8d7edbb8..419ee1e5e9 100644
--- a/components/wiki/test/wikihelpmanager.pas
+++ b/components/wiki/test/wikihelpmanager.pas
@@ -1242,7 +1242,9 @@ var
   StartTime: TDateTime;
   EndTime: TDateTime;
 begin
+  {$IF FPC_FULLVERSION<30000}
   CurrentThread:=Self;
+  {$ENDIF}
   try
     Files:=nil;
     try
@@ -1293,7 +1295,9 @@ begin
     end;
   finally
     Scanned;
+    {$IF FPC_FULLVERSION<30000}
     CurrentThread:=nil;
+    {$ENDIF}
   end;
 end;
 
diff --git a/components/wiki/test/wikisearchdemo.res b/components/wiki/test/wikisearchdemo.res
index 7c6cf3e4be6fa881cb2f2caa9bda693328155c28..e994dfa65a96d79259e5ee4940a4dbaf7a725d38 100644
GIT binary patch
delta 594
zcmaLVJxc>I7zgmvLnvz9l#a2^Pn*}f1kU2>qJv=P<dVQaUk>k7ibxR$*NUISse@m@
zZ{tU(N9$0v?U>}@m+=2*GOc}n)Fx=}VkZbt5CpSX<LxUvd_UU{4^Wa0`?)SNll8Ll
z_3321ydJggNV8MlMJUmE-pkTza5$K6pyU_;b+dsT-WTXPD@u(3evXRUJRjba&R$-j
zb9>r+a1;~5MGQpn2sldxXyF}TEUj~nS?2L$6SX__adp{mJKo?jL6|g3gRrV{y|Ex2
zwV)~Im{Q>t(+l?>D_67Q`Fpvho=V3+Fr$ETPQYlDf{m2rn(N3hxz25o)$$xBK8m9>
zjzD5ZfK#SG31dJqi+yCV9qV|VOz;L+I_zUjC>U>8m4uT}<syJfZw1ywXtkU~`){8~
idr|z+;wOx%CX==<3fDKiQ73rrhA-W4YuXLBRpT4YW~CPZ

delta 40
wcmX@Hn`6RujtL4(;>;VBw3xYV^b?DVQ*)DYD(#y4S=;+r8MpVdGFeIh01!qDi~s-t