[Libreoffice-commits] core.git: vcl/Executable_fftester.mk vcl/workben

[Caolán McNamara]

 vcl/Executable_fftester.mk |    6 +-----
 vcl/workben/fftester.cxx   |    4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit b2fd800446d3a84dc436dfe36a809e3904f6ad40
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 24 13:50:55 2017 +0000

    fix macosx build failure
    
    I only *need* it for the fuzzers, just wanted to keep this in sync with
    those for simplicity
    
    Change-Id: I4fd8aef54c6604c0d44faca9a6515bfd8e85d8bf

diff --git a/vcl/Executable_fftester.mk b/vcl/Executable_fftester.mk
index 14fa5965193d..0eaa4e39c3c2 100644
--- a/vcl/Executable_fftester.mk
+++ b/vcl/Executable_fftester.mk
@@ -15,11 +15,7 @@ $(eval $(call gb_Executable_use_api,fftester,\
     udkapi \
 ))
 
-$(eval $(call gb_Executable_use_externals,fftester,\
-	boost_headers \
-	freetype_headers \
-	harfbuzz \
-))
+$(eval $(call gb_Executable_use_external,fftester,boost_headers))
 
 $(eval $(call gb_Executable_set_include,fftester,\
     $$(INCLUDE) \
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 51b518fa3351..ec4ceefe3b3a 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -52,8 +52,6 @@
 #include <osl/file.hxx>
 #include <unistd.h>
 #include <signal.h>
-#include "headless/svpgdi.hxx"
-#include "unx/glyphcache.hxx"
 
 #include <../source/filter/igif/gifread.hxx>
 #include <../source/filter/ixbm/xbmread.hxx>
@@ -447,8 +445,6 @@ try_again:
         }
 
         /* If AFL_PERSISTENT not set or PERSIST_MAX exceeded, exit normally. */
-
-        SvpSalGraphics::getPlatformGlyphCache().ClearFontOptions();
     }
     catch (...)
     {