From 818cc5aef331bbea8e3f51fde0d16930d3c7d61b Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 11 Oct 2020 03:30:45 +0000 Subject: freetype 2.10.3 git-svn-id: svn://tug.org/texlive/trunk@56628 c570f23f-e606-0410-a88d-b1316a301751 --- .../freetype2/freetype-src/src/psnames/Jamfile | 31 ---------------------- .../freetype2/freetype-src/src/psnames/psmodule.c | 7 +++-- .../freetype2/freetype-src/src/psnames/psmodule.h | 3 +-- .../freetype2/freetype-src/src/psnames/psnamerr.h | 4 +-- .../freetype2/freetype-src/src/psnames/psnames.c | 1 - 5 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile (limited to 'Build/source/libs/freetype2/freetype-src/src/psnames') diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile b/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile deleted file mode 100644 index 9bd6b569fe7..00000000000 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/Jamfile +++ /dev/null @@ -1,31 +0,0 @@ -# FreeType 2 src/psnames Jamfile -# -# Copyright (C) 2001-2020 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - -SubDir FT2_TOP $(FT2_SRC_DIR) psnames ; - -{ - local _sources ; - - if $(FT2_MULTI) - { - _sources = psmodule - pspic - ; - } - else - { - _sources = psnames ; - } - - Library $(FT2_LIB) : $(_sources).c ; -} - -# end of src/psnames Jamfile diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c index bb3ff07022d..b38f9d3b1cd 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.c @@ -16,10 +16,9 @@ */ -#include -#include FT_INTERNAL_DEBUG_H -#include FT_INTERNAL_OBJECTS_H -#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include +#include +#include #include "psmodule.h" diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h index 955f699f3a2..c85a9ecad7a 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psmodule.h @@ -20,8 +20,7 @@ #define PSMODULE_H_ -#include -#include FT_MODULE_H +#include FT_BEGIN_HEADER diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h b/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h index fb9058e61ae..154c701d040 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psnamerr.h @@ -26,7 +26,7 @@ #ifndef PSNAMERR_H_ #define PSNAMERR_H_ -#include FT_MODULE_ERRORS_H +#include #undef FTERRORS_H_ @@ -34,7 +34,7 @@ #define FT_ERR_PREFIX PSnames_Err_ #define FT_ERR_BASE FT_Mod_Err_PSnames -#include FT_ERRORS_H +#include #endif /* PSNAMERR_H_ */ diff --git a/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c b/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c index 5ac3897d250..cff36851baa 100644 --- a/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c +++ b/Build/source/libs/freetype2/freetype-src/src/psnames/psnames.c @@ -17,7 +17,6 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT -#include #include "psmodule.c" -- cgit v1.2.3