minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Revert unrelated changes

This commit is contained in:
Anurag Thakur 2022-07-26 01:25:15 +05:30
parent 9aafe98c1d
commit 94183cf0b6
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builds/amiga/include/config/ftmodule.h
View File

@ -4,13 +4,8 @@
/* */
/* Amiga-specific FreeType module selection. */
/* */
<<<<<<< HEAD
/* Copyright (C) 2005-2022 by */
/* Werner Lemberg and Detlef Würkner. */
=======
/* Copyright (C) 2005-2021 by */
/* Werner Lemberg and Detlef W<>rkner. */
>>>>>>> d9fdb2202 (Compilation fix attempt #1)
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
@ -140,10 +135,6 @@ FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
#endif
#ifdef FT_USE_DENSE
FT_USE_MODULE( FT_Renderer_Class, ft_dense_renderer_class )
#endif
#ifdef FT_USE_SMOOTH
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
#endif

6
builds/mac/ftmac.c
View File

@ -75,9 +75,9 @@
#undef OS_INLINE
#define OS_INLINE static __inline__
#endif
// #include <CoreServices/CoreServices.h>
// #include <ApplicationServices/ApplicationServices.h>
// #include <sys/syslimits.h> /* PATH_MAX */
#include <CoreServices/CoreServices.h>
#include <ApplicationServices/ApplicationServices.h>
#include <sys/syslimits.h> /* PATH_MAX */
#else
#include <Resources.h>
#include <Fonts.h>