[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - scp2/source

[Caolán McNamara]

 scp2/source/ooo/file_font_ooo.scp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bfe3a3386e643ad90e984ae35b43cd3a9a38c69
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 8 10:53:28 2017 +0000

    fix mac build wrt fontconfig conf file
    
    Change-Id: Ic13ea258773ad68ba295d29078eaf69365f951c9
    Reviewed-on: https://gerrit.libreoffice.org/46086
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 08ba609ff397..e9207797fbc8 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -69,7 +69,7 @@ STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist")
 
 // fontconfig updates to allow proper use of local fonts
 
-#ifdef UNX
+#ifdef USING_X11
 #ifndef WITHOUT_FONTS
 File gid_File_FcLocal_Conf
     Dir = FILELIST_DIR;