ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve `make multi'. 

* src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2.

* src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH.

* src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM.

* src/sfnt/pngshim.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS also.

* src/sfnt/ttbdf.c: Avoid empty source file.
* src/sfnt/ttpost.c: Guard file with
TT_CONFIG_OPTION_POSTSCRIPT_NAMES.
* src/sfnt/ttsbit.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS.

* src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty
source file.

* src/truetype/ttsubpix.c: Guard file with
TT_USE_BYTECODE_INTERPRETER also.

* src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM.

* src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c,
src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c,
src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c,
src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c,
src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c,
src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort
entries.
This commit is contained in:
Werner Lemberg 2017-03-18 07:06:49 +01:00
parent d5bfa053f5
commit 9931175dcc
31 changed files with 206 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ChangeLog
View File

@ -1,3 +1,38 @@
2017-03-17 Werner Lemberg <wl@gnu.org>
Improve `make multi'.
* src/autofit/aflatin2.c: Guard file with FT_OPTION_AUTOFIT2.
* src/base/ftmac.c: Guard more parts of the file with FT_MACINTOSH.
* src/psaux/afmparse.c: Guard file with T1_CONFIG_OPTION_NO_AFM.
* src/sfnt/pngshim.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS also.
* src/sfnt/ttbdf.c: Avoid empty source file.
* src/sfnt/ttpost.c: Guard file with
TT_CONFIG_OPTION_POSTSCRIPT_NAMES.
* src/sfnt/ttsbit.c: Guard file with
TT_CONFIG_OPTION_EMBEDDED_BITMAPS.
* src/truetype/ttgxvar.c, src/truetype/ttinterp.c: Avoid empty
source file.
* src/truetype/ttsubpix.c: Guard file with
TT_USE_BYTECODE_INTERPRETER also.
* src/type1/t1afm.c: Guard file with T1_CONFIG_OPTION_NO_AFM.
* src/autofit/autofit.c, src/base/ftbase.c, src/cache/ftcache.c,
src/cff/cff.c, src/cid/type1cid.c, src/gxvalid/gxvalid.c,
src/pcf/pcf.c, src/pfr/pfr.c, src/psaux/psaux.c,
src/pshinter/pshinter.c, src/psnames/psnames.c, src/raster/raster.c,
src/sfnt/sfnt.c, src/smooth/smooth.c, src/truetype/truetype.c,
src/type1/type1.c, src/type42/type42.c: Remove conditionals; sort
entries.
2017-03-17 Werner Lemberg <wl@gnu.org>
Fixes for conditional compilation.

10
src/autofit/aflatin2.c
View File

@ -23,6 +23,9 @@
#include FT_ADVANCES_H
#ifdef FT_OPTION_AUTOFIT2
#include "afglobal.h"
#include "aflatin.h"
#include "aflatin2.h"
@ -2419,5 +2422,12 @@
(AF_WritingSystem_ApplyHintsFunc) af_latin2_hints_apply /* style_hints_apply */
)
#else /* !FT_OPTION_AUTOFIT2 */
/* ANSI C doesn't like empty source files */
typedef int _af_latin2_dummy;
#endif /* !FT_OPTION_AUTOFIT2 */
/* END */

25
src/autofit/autofit.c
View File

@ -18,29 +18,22 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "afpic.c"
#include "afangles.c"
#include "afblue.c"
#include "afcjk.c"
#include "afdummy.c"
#include "afglobal.c"
#include "afhints.c"
#include "afranges.c"
#include "afdummy.c"
#include "aflatin.c"
#ifdef FT_OPTION_AUTOFIT2
#include "aflatin2.c"
#endif
#include "afcjk.c"
#include "afindic.c"
#include "afshaper.c"
#include "aflatin.c"
#include "aflatin2.c"
#include "afloader.c"
#include "afmodule.c"
#ifdef AF_CONFIG_OPTION_USE_WARPER
#include "afpic.c"
#include "afranges.c"
#include "afshaper.c"
#include "afwarp.c"
#endif
/* END */

7
src/base/ftbase.c
View File

@ -17,26 +17,23 @@
#include <ft2build.h>
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include "ftpic.c"
#include "basepic.c"
#include "ftadvanc.c"
#include "ftcalc.c"
#include "ftdbgmem.c"
#include "ftgloadr.c"
#include "fthash.c"
#include "ftmac.c"
#include "ftobjs.c"
#include "ftoutln.c"
#include "ftpic.c"
#include "ftrfork.c"
#include "ftsnames.c"
#include "ftstream.c"
#include "fttrigon.c"
#include "ftutil.c"
#ifdef FT_MACINTOSH
#include "ftmac.c"
#endif
/* END */

12
src/base/ftmac.c
View File

@ -71,6 +71,9 @@
#include FT_INTERNAL_STREAM_H
#include "ftbase.h"
#ifdef FT_MACINTOSH
/* This is for Mac OS X. Without redefinition, OS_INLINE */
/* expands to `static inline' which doesn't survive the */
/* -ansi compilation flag of GCC. */
@ -118,8 +121,6 @@
#endif
#ifdef FT_MACINTOSH
/* This function is deprecated because FSSpec is deprecated in Mac OS X */
FT_EXPORT_DEF( FT_Error )
FT_GetFile_From_Mac_Name( const char* fontName,
@ -1076,7 +1077,12 @@
#endif
}
#endif /* FT_MACINTOSH */
#else /* !FT_MACINTOSH */
/* ANSI C doesn't like empty source files */
typedef int _ft_mac_dummy;
#endif /* !FT_MACINTOSH */
/* END */

3
src/bdf/bdf.c
View File

@ -24,9 +24,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#define FT_MAKE_OPTION_SINGLE_OBJECT
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "bdflib.c"
#include "bdfdrivr.c"

9
src/cache/ftcache.c vendored
View File

@ -17,15 +17,16 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "ftcmru.c"
#include "ftcmanag.c"
#include "ftcbasic.c"
#include "ftccache.c"
#include "ftccmap.c"
#include "ftcglyph.c"
#include "ftcimage.c"
#include "ftcmanag.c"
#include "ftcmru.c"
#include "ftcsbits.c"
#include "ftcbasic.c"
/* END */

8
src/cff/cff.c
View File

@ -17,16 +17,15 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "cffpic.c"
#include "cffcmap.c"
#include "cffdrivr.c"
#include "cffgload.c"
#include "cffparse.c"
#include "cffpic.c"
#include "cffload.c"
#include "cffobjs.c"
#include "cffgload.c"
#include "cffcmap.c"
#include "cf2arrst.c"
#include "cf2blues.c"
@ -38,4 +37,5 @@
#include "cf2read.c"
#include "cf2stack.c"
/* END */

6
src/cid/type1cid.c
View File

@ -17,13 +17,13 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "cidparse.c"
#include "cidgload.c"
#include "cidload.c"
#include "cidobjs.c"
#include "cidparse.c"
#include "cidriver.c"
#include "cidgload.c"
/* END */

14
src/gxvalid/gxvalid.c
View File

@ -16,15 +16,17 @@
/* */
/***************************************************************************/
#define FT_MAKE_OPTION_SINGLE_OBJECT
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "gxvfeat.c"
#include "gxvcommn.c"
#include "gxvbsln.c"
#include "gxvtrak.c"
#include "gxvcommn.c"
#include "gxvfeat.c"
#include "gxvjust.c"
#include "gxvkern.c"
#include "gxvlcar.c"
#include "gxvmod.c"
#include "gxvmort.c"
#include "gxvmort0.c"
#include "gxvmort1.c"
@ -37,11 +39,9 @@
#include "gxvmorx2.c"
#include "gxvmorx4.c"
#include "gxvmorx5.c"
#include "gxvkern.c"
#include "gxvopbd.c"
#include "gxvprop.c"
#include "gxvlcar.c"
#include "gxvmod.c"
#include "gxvtrak.c"
/* END */

3
src/otvalid/otvalid.c
View File

@ -15,8 +15,8 @@
/* */
/***************************************************************************/
#define FT_MAKE_OPTION_SINGLE_OBJECT
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "otvbase.c"
@ -28,4 +28,5 @@
#include "otvmath.c"
#include "otvmod.c"
/* END */

8
src/pcf/pcf.c
View File

@ -26,11 +26,11 @@ THE SOFTWARE.
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "pcfutil.c"
#include "pcfread.c"
#include "pcfdrivr.c"
#include "pcfread.c"
#include "pcfutil.c"
/* END */

9
src/pfr/pfr.c
View File

@ -15,15 +15,16 @@
/* */
/***************************************************************************/
#define FT_MAKE_OPTION_SINGLE_OBJECT
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "pfrload.c"
#include "pfrgload.c"
#include "pfrcmap.c"
#include "pfrobjs.c"
#include "pfrdrivr.c"
#include "pfrgload.c"
#include "pfrload.c"
#include "pfrobjs.c"
#include "pfrsbit.c"
/* END */

9
src/psaux/afmparse.c
View File

@ -20,6 +20,8 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#ifndef T1_CONFIG_OPTION_NO_AFM
#include "afmparse.h"
#include "psconv.h"
@ -973,5 +975,12 @@
return error;
}
#else /* T1_CONFIG_OPTION_NO_AFM */
/* ANSI C doesn't like empty source files */
typedef int _afm_parse_dummy;
#endif /* T1_CONFIG_OPTION_NO_AFM */
/* END */

12
src/psaux/psaux.c
View File

@ -17,18 +17,14 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "psobjs.c"
#include "psauxmod.c"
#include "t1decode.c"
#include "t1cmap.c"
#ifndef T1_CONFIG_OPTION_NO_AFM
#include "afmparse.c"
#endif
#include "psauxmod.c"
#include "psconv.c"
#include "psobjs.c"
#include "t1cmap.c"
#include "t1decode.c"
/* END */

8
src/pshinter/pshinter.c
View File

@ -17,13 +17,13 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "pshalgo.c"
#include "pshglob.c"
#include "pshmod.c"
#include "pshpic.c"
#include "pshrec.c"
#include "pshglob.c"
#include "pshalgo.c"
#include "pshmod.c"
/* END */

4
src/psnames/psnames.c
View File

@ -17,10 +17,10 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "pspic.c"
#include "psmodule.c"
#include "pspic.c"
/* END */

4
src/raster/raster.c
View File

@ -17,11 +17,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "rastpic.c"
#include "ftraster.c"
#include "ftrend1.c"
#include "rastpic.c"
/* END */

10
src/sfnt/pngshim.c
View File

@ -24,7 +24,8 @@
#include FT_CONFIG_STANDARD_LIBRARY_H
#ifdef FT_CONFIG_OPTION_USE_PNG
#if defined( TT_CONFIG_OPTION_EMBEDDED_BITMAPS ) && \
defined( FT_CONFIG_OPTION_USE_PNG )
/* We always include <setjmp.h>, so make libpng shut up! */
#define PNG_SKIP_SETJMP_CHECK 1
@ -377,7 +378,12 @@
return error;
}
#endif /* FT_CONFIG_OPTION_USE_PNG */
#else /* !(TT_CONFIG_OPTION_EMBEDDED_BITMAPS && FT_CONFIG_OPTION_USE_PNG) */
/* ANSI C doesn't like empty source files */
typedef int _pngshim_dummy;
#endif /* !(TT_CONFIG_OPTION_EMBEDDED_BITMAPS && FT_CONFIG_OPTION_USE_PNG) */
/* END */

24
src/sfnt/sfnt.c
View File

@ -17,27 +17,19 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "pngshim.c"
#include "sfdriver.c"
#include "sfntpic.c"
#include "ttload.c"
#include "ttmtx.c"
#include "sfobjs.c"
#include "ttbdf.c"
#include "ttcmap.c"
#include "ttkern.c"
#include "sfobjs.c"
#include "sfdriver.c"
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#include "pngshim.c"
#include "ttsbit.c"
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#include "ttload.c"
#include "ttmtx.c"
#include "ttpost.c"
#endif
#include "ttsbit.c"
#ifdef TT_CONFIG_OPTION_BDF
#include "ttbdf.c"
#endif
/* END */

7
src/sfnt/ttbdf.c
View File

@ -246,7 +246,12 @@
return error;
}
#endif /* TT_CONFIG_OPTION_BDF */
#else /* !TT_CONFIG_OPTION_BDF */
/* ANSI C doesn't like empty source files */
typedef int _tt_bdf_dummy;
#endif /* !TT_CONFIG_OPTION_BDF */
/* END */

11
src/sfnt/ttpost.c
View File

@ -29,6 +29,10 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#include "ttpost.h"
#include "sferrors.h"
@ -561,5 +565,12 @@
return FT_Err_Ok;
}
#else /* !TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
/* ANSI C doesn't like empty source files */
typedef int _tt_post_dummy;
#endif /* !TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
/* END */

13
src/sfnt/ttsbit.c
View File

@ -24,6 +24,10 @@
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#include FT_BITMAP_H
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#include "ttsbit.h"
#include "sferrors.h"
@ -1650,5 +1654,12 @@
return error;
}
#else /* !TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
/* EOF */
/* ANSI C doesn't like empty source files */
typedef int _tt_sbit_dummy;
#endif /* !TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
/* END */

4
src/smooth/smooth.c
View File

@ -17,11 +17,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "ftspic.c"
#include "ftgrays.c"
#include "ftsmooth.c"
#include "ftspic.c"
/* END */

18
src/truetype/truetype.c
View File

@ -17,22 +17,16 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "ttpic.c"
#include "ttdriver.c" /* driver interface */
#include "ttpload.c" /* tables loader */
#include "ttgload.c" /* glyph loader */
#include "ttobjs.c" /* object manager */
#ifdef TT_USE_BYTECODE_INTERPRETER
#include "ttinterp.c"
#include "ttsubpix.c"
#endif
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
#include "ttgxvar.c" /* gx distortable font */
#endif
#include "ttinterp.c"
#include "ttobjs.c" /* object manager */
#include "ttpic.c"
#include "ttpload.c" /* tables loader */
#include "ttsubpix.c"
/* END */

7
src/truetype/ttgxvar.c
View File

@ -3721,7 +3721,12 @@
}
}
#endif /* TT_CONFIG_OPTION_GX_VAR_SUPPORT */
#else /* !TT_CONFIG_OPTION_GX_VAR_SUPPORT */
/* ANSI C doesn't like empty source files */
typedef int _tt_gxvar_dummy;
#endif /* !TT_CONFIG_OPTION_GX_VAR_SUPPORT */
/* END */

6
src/truetype/ttinterp.c
View File

@ -8415,8 +8415,12 @@
return exc->error;
}
#else /* !TT_USE_BYTECODE_INTERPRETER */
#endif /* TT_USE_BYTECODE_INTERPRETER */
/* ANSI C doesn't like empty source files */
typedef int _tt_interp_dummy;
#endif /* !TT_USE_BYTECODE_INTERPRETER */
/* END */

9
src/truetype/ttsubpix.c
View File

@ -27,7 +27,8 @@
#include "ttsubpix.h"
#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
#if defined( TT_USE_BYTECODE_INTERPRETER ) && \
defined( TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY )
/*************************************************************************/
/* */
@ -1000,12 +1001,14 @@
}
}
#else /* !TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
#else /* !(TT_USE_BYTECODE_INTERPRETER && */
/* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY) */
/* ANSI C doesn't like empty source files */
typedef int _tt_subpix_dummy;
#endif /* !TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
#endif /* !(TT_USE_BYTECODE_INTERPRETER && */
/* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY) */
/* END */

9
src/type1/t1afm.c
View File

@ -24,6 +24,8 @@
#include "t1errors.h"
#ifndef T1_CONFIG_OPTION_NO_AFM
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
@ -402,5 +404,12 @@
return FT_Err_Ok;
}
#else /* T1_CONFIG_OPTION_NO_AFM */
/* ANSI C doesn't like empty source files */
typedef int _t1_afm_dummy;
#endif /* T1_CONFIG_OPTION_NO_AFM */
/* END */

13
src/type1/type1.c
View File

@ -17,17 +17,14 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "t1parse.c"
#include "t1load.c"
#include "t1objs.c"
#include "t1afm.c"
#include "t1driver.c"
#include "t1gload.c"
#ifndef T1_CONFIG_OPTION_NO_AFM
#include "t1afm.c"
#endif
#include "t1load.c"
#include "t1objs.c"
#include "t1parse.c"
/* END */

6
src/type42/type42.c
View File

@ -15,11 +15,13 @@
/* */
/***************************************************************************/
#define FT_MAKE_OPTION_SINGLE_OBJECT
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include "t42drivr.c"
#include "t42objs.c"
#include "t42parse.c"
#include "t42drivr.c"
/* END */