From c597c5f12db1b76e55c6f110b231cf181959fa61 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 8 Jan 2018 17:00:05 +0000
Subject: route cff typedefs to our sal ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idbe907195f6e800e42c59ac8dbe4385d60afee80
Reviewed-on: https://gerrit.libreoffice.org/47610
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/source/fontsubset/cff.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'vcl/source/fontsubset/cff.cxx')

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 284242882274..286c13e411ce 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -19,21 +19,21 @@
 
 #include <cstdio>
 #include <cstring>
+#include <vector>
 #include <assert.h>
 
 #include <fontsubset.hxx>
 
 #include <vcl/strhelper.hxx>
 
-typedef unsigned char U8;
-typedef unsigned short U16;
-typedef long long S64;
+typedef sal_uInt8 U8;
+typedef sal_uInt16 U16;
+typedef sal_Int64 S64;
 
 typedef sal_Int32 GlyphWidth;
 
 typedef double RealType;
 typedef RealType ValType;
-#include <vector>
 
 static const char* pStringIds[] = {
 /*0*/   ".notdef",      "space",            "exclam",           "quotedbl",
-- 
cgit