This repository has been archived by the owner on Dec 3, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 22
Disable icu, enable UCDN in harfbuzz #97
Comments
This is the configure output on unix for harfbuzz:
|
And freetype 2.6.5:
|
And this is the
|
Diff of above diff --git a/ftconfig.h b/ftconfig.h
index 157a704..501f2a6 100644
--- a/ftconfig.h
+++ b/ftconfig.h
@@ -1,8 +1,9 @@
+/* ftconfig.h. Generated from ftconfig.in by configure. */
/***************************************************************************/
/* */
-/* ftconfig.h */
+/* ftconfig.in */
/* */
-/* ANSI-specific configuration file (specification only). */
+/* UNIX-specific configuration file (specification only). */
/* */
/* Copyright 1996-2016 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -31,10 +32,9 @@
/* system-specific files that are always included first when building */
/* the library. */
/* */
- /* This ANSI version should stay in `include/config/'. */
- /* */
/*************************************************************************/
+
#ifndef FTCONFIG_H_
#define FTCONFIG_H_
@@ -58,6 +58,11 @@ FT_BEGIN_HEADER
/*************************************************************************/
+#define HAVE_UNISTD_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_STDINT_H 1
+
+
/* There are systems (like the Texas Instruments 'C54x) where a `char' */
/* has 16 bits. ANSI C says that sizeof(char) is always 1. Since an */
/* `int' has 16 bits also for this system, sizeof(int) gives 1 which */
@@ -71,6 +76,22 @@ FT_BEGIN_HEADER
#endif
+/* #undef FT_USE_AUTOCONF_SIZEOF_TYPES */
+#ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
+
+#define SIZEOF_INT 4
+#define SIZEOF_LONG 8
+#define FT_SIZEOF_INT SIZEOF_INT
+#define FT_SIZEOF_LONG SIZEOF_LONG
+
+#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
+
+ /* Following cpp computation of the bit length of int and long */
+ /* is copied from default include/freetype/config/ftconfig.h. */
+ /* If any improvement is required for this file, it should be */
+ /* applied to the original header file for the builders that */
+ /* do not use configure script. */
+
/* The size of an `int' type. */
#if FT_UINT_MAX == 0xFFFFUL
#define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
@@ -94,6 +115,8 @@ FT_BEGIN_HEADER
#error "Unsupported size of `long' type!"
#endif
+#endif /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
+
/* FT_UNUSED is a macro used to indicate that a given parameter is not */
/* used -- this is only used to get rid of unpleasant compiler warnings */
@@ -143,6 +166,14 @@ FT_BEGIN_HEADER
#endif
+ /* Fix compiler warning with sgi compiler */
+#if defined( __sgi ) && !defined( __GNUC__ )
+#if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 )
+#pragma set woff 3505
+#endif
+#endif
+
+
/*************************************************************************/
/* */
/* <Section> */
@@ -228,12 +259,12 @@ FT_BEGIN_HEADER
#endif
-#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)
+#if FT_SIZEOF_INT == 4
typedef signed int FT_Int32;
typedef unsigned int FT_UInt32;
-#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)
+#elif FT_SIZEOF_LONG == 4
typedef signed long FT_Int32;
typedef unsigned long FT_UInt32;
@@ -244,12 +275,12 @@ FT_BEGIN_HEADER
/* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)
+#if FT_SIZEOF_INT >= 4
typedef int FT_Fast;
typedef unsigned int FT_UFast;
-#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)
+#elif FT_SIZEOF_LONG >= 4
typedef long FT_Fast;
typedef unsigned long FT_UFast;
@@ -259,7 +290,7 @@ FT_BEGIN_HEADER
/* determine whether we have a 64-bit int type for platforms without */
/* Autoconf */
-#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)
+#if FT_SIZEOF_LONG == 8
/* FT_LONG64 must be defined if a 64-bit type is available */
#define FT_LONG64
@@ -317,7 +348,7 @@ FT_BEGIN_HEADER
#endif /* __STDC_VERSION__ >= 199901L */
-#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */
+#endif /* FT_SIZEOF_LONG == 8 */
#ifdef FT_LONG64
typedef FT_INT64 FT_Int64;
@@ -470,4 +501,4 @@ FT_END_HEADER
#endif /* FTCONFIG_H_ */
-/* END */
+/* END */
\ No newline at end of file |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Per 477c675#commitcomment-18957469
/cc @BergWerkGIS
The text was updated successfully, but these errors were encountered: