diff --git a/freetype2/include/ios/freetype2/config/ftconfig.h b/freetype2/include/ios/freetype2/config/ftconfig.h index 0c8844ec2b..792ba94c01 100755 --- a/freetype2/include/ios/freetype2/config/ftconfig.h +++ b/freetype2/include/ios/freetype2/config/ftconfig.h @@ -38,7 +38,7 @@ #ifndef __FTCONFIG_H__ #define __FTCONFIG_H__ -#include +#include "ft2build.h" #include FT_CONFIG_OPTIONS_H #include FT_CONFIG_STANDARD_LIBRARY_H diff --git a/freetype2/include/ios/freetype2/config/ftheader.h b/freetype2/include/ios/freetype2/config/ftheader.h index b623629921..f51cd10bb6 100755 --- a/freetype2/include/ios/freetype2/config/ftheader.h +++ b/freetype2/include/ios/freetype2/config/ftheader.h @@ -21,10 +21,10 @@ /*@***********************************************************************/ /* */ - /* */ + /* "Macro" */ /* FT_BEGIN_HEADER */ /* */ - /* */ + /* "Description" */ /* This macro is used in association with @FT_END_HEADER in header */ /* files to ensure that the declarations within are properly */ /* encapsulated in an `extern "C" { .. }' block when included from a */ @@ -39,10 +39,10 @@ /*@***********************************************************************/ /* */ - /* */ + /* "Macro" */ /* FT_END_HEADER */ /* */ - /* */ + /* "Description" */ /* This macro is used in association with @FT_BEGIN_HEADER in header */ /* files to ensure that the declarations within are properly */ /* encapsulated in an `extern "C" { .. }' block when included from a */ @@ -63,16 +63,16 @@ /*************************************************************************/ /* */ - /*
*/ + /* "Section" */ /* header_file_macros */ /* */ - /* */ + /* "Title" */ /* Header File Macros */ /* */ - /* <Abstract> */ + /* "Abstract" */ /* Macro definitions used to #include specific header files. */ /* */ - /* <Description> */ + /* "Description" */ /* The following macros are defined to the name of specific */ /* FreeType~2 header files. They can be used directly in #include */ /* statements as in: */ @@ -107,7 +107,7 @@ * */ #ifndef FT_CONFIG_CONFIG_H -#define FT_CONFIG_CONFIG_H <config/ftconfig.h> +#define FT_CONFIG_CONFIG_H "config/ftconfig.h" #endif @@ -122,7 +122,7 @@ * */ #ifndef FT_CONFIG_STANDARD_LIBRARY_H -#define FT_CONFIG_STANDARD_LIBRARY_H <config/ftstdlib.h> +#define FT_CONFIG_STANDARD_LIBRARY_H "config/ftstdlib.h" #endif @@ -137,7 +137,7 @@ * */ #ifndef FT_CONFIG_OPTIONS_H -#define FT_CONFIG_OPTIONS_H <config/ftoption.h> +#define FT_CONFIG_OPTIONS_H "config/ftoption.h" #endif @@ -153,7 +153,7 @@ * */ #ifndef FT_CONFIG_MODULES_H -#define FT_CONFIG_MODULES_H <config/ftmodule.h> +#define FT_CONFIG_MODULES_H "config/ftmodule.h" #endif /* */ @@ -170,7 +170,7 @@ * base FreeType~2 API. * */ -#define FT_FREETYPE_H <freetype.h> +#define FT_FREETYPE_H "freetype.h" /************************************************************************* @@ -185,7 +185,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_ERRORS_H <fterrors.h> +#define FT_ERRORS_H "fterrors.h" /************************************************************************* @@ -198,7 +198,7 @@ * list of FreeType~2 module error offsets (and messages). * */ -#define FT_MODULE_ERRORS_H <ftmoderr.h> +#define FT_MODULE_ERRORS_H "ftmoderr.h" /************************************************************************* @@ -214,7 +214,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_SYSTEM_H <ftsystem.h> +#define FT_SYSTEM_H "ftsystem.h" /************************************************************************* @@ -230,7 +230,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_IMAGE_H <ftimage.h> +#define FT_IMAGE_H "ftimage.h" /************************************************************************* @@ -245,7 +245,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_TYPES_H <fttypes.h> +#define FT_TYPES_H "fttypes.h" /************************************************************************* @@ -260,7 +260,7 @@ * (Most applications will never need to include this file.) * */ -#define FT_LIST_H <ftlist.h> +#define FT_LIST_H "ftlist.h" /************************************************************************* @@ -273,7 +273,7 @@ * scalable outline management API of FreeType~2. * */ -#define FT_OUTLINE_H <ftoutln.h> +#define FT_OUTLINE_H "ftoutln.h" /************************************************************************* @@ -286,7 +286,7 @@ * API which manages multiple @FT_Size objects per face. * */ -#define FT_SIZES_H <ftsizes.h> +#define FT_SIZES_H "ftsizes.h" /************************************************************************* @@ -299,7 +299,7 @@ * module management API of FreeType~2. * */ -#define FT_MODULE_H <ftmodapi.h> +#define FT_MODULE_H "ftmodapi.h" /************************************************************************* @@ -312,7 +312,7 @@ * renderer module management API of FreeType~2. * */ -#define FT_RENDER_H <ftrender.h> +#define FT_RENDER_H "ftrender.h" /************************************************************************* @@ -325,7 +325,7 @@ * structures and macros related to the auto-hinting module. * */ -#define FT_AUTOHINTER_H <ftautoh.h> +#define FT_AUTOHINTER_H "ftautoh.h" /************************************************************************* @@ -338,7 +338,7 @@ * structures and macros related to the CFF driver module. * */ -#define FT_CFF_DRIVER_H <ftcffdrv.h> +#define FT_CFF_DRIVER_H "ftcffdrv.h" /************************************************************************* @@ -351,7 +351,7 @@ * structures and macros related to the TrueType driver module. * */ -#define FT_TRUETYPE_DRIVER_H <ftttdrv.h> +#define FT_TRUETYPE_DRIVER_H "ftttdrv.h" /************************************************************************* @@ -364,7 +364,7 @@ * types and API specific to the Type~1 format. * */ -#define FT_TYPE1_TABLES_H <t1tables.h> +#define FT_TYPE1_TABLES_H "t1tables.h" /************************************************************************* @@ -379,7 +379,7 @@ * definitions, taken from the TrueType and OpenType specifications. * */ -#define FT_TRUETYPE_IDS_H <ttnameid.h> +#define FT_TRUETYPE_IDS_H "ttnameid.h" /************************************************************************* @@ -392,7 +392,7 @@ * types and API specific to the TrueType (as well as OpenType) format. * */ -#define FT_TRUETYPE_TABLES_H <tttables.h> +#define FT_TRUETYPE_TABLES_H "tttables.h" /************************************************************************* @@ -406,7 +406,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_TRUETYPE_TAGS_H <tttags.h> +#define FT_TRUETYPE_TAGS_H "tttags.h" /************************************************************************* @@ -420,7 +420,7 @@ * face. * */ -#define FT_BDF_H <ftbdf.h> +#define FT_BDF_H "ftbdf.h" /************************************************************************* @@ -434,7 +434,7 @@ * face. * */ -#define FT_CID_H <ftcid.h> +#define FT_CID_H "ftcid.h" /************************************************************************* @@ -447,7 +447,7 @@ * definitions of an API which supports gzip-compressed files. * */ -#define FT_GZIP_H <ftgzip.h> +#define FT_GZIP_H "ftgzip.h" /************************************************************************* @@ -460,7 +460,7 @@ * definitions of an API which supports LZW-compressed files. * */ -#define FT_LZW_H <ftlzw.h> +#define FT_LZW_H "ftlzw.h" /************************************************************************* @@ -473,7 +473,7 @@ * definitions of an API which supports bzip2-compressed files. * */ -#define FT_BZIP2_H <ftbzip2.h> +#define FT_BZIP2_H "ftbzip2.h" /************************************************************************* @@ -486,7 +486,7 @@ * definitions of an API which supports Windows FNT files. * */ -#define FT_WINFONTS_H <ftwinfnt.h> +#define FT_WINFONTS_H "ftwinfnt.h" /************************************************************************* @@ -499,7 +499,7 @@ * API of the optional glyph management component. * */ -#define FT_GLYPH_H <ftglyph.h> +#define FT_GLYPH_H "ftglyph.h" /************************************************************************* @@ -512,7 +512,7 @@ * API of the optional bitmap conversion component. * */ -#define FT_BITMAP_H <ftbitmap.h> +#define FT_BITMAP_H "ftbitmap.h" /************************************************************************* @@ -525,7 +525,7 @@ * API of the optional exact bounding box computation routines. * */ -#define FT_BBOX_H <ftbbox.h> +#define FT_BBOX_H "ftbbox.h" /************************************************************************* @@ -538,7 +538,7 @@ * API of the optional FreeType~2 cache sub-system. * */ -#define FT_CACHE_H <ftcache.h> +#define FT_CACHE_H "ftcache.h" /************************************************************************* @@ -612,7 +612,7 @@ * compiled on the Mac (note that the base API still works though). * */ -#define FT_MAC_H <ftmac.h> +#define FT_MAC_H "ftmac.h" /************************************************************************* @@ -625,7 +625,7 @@ * optional multiple-masters management API of FreeType~2. * */ -#define FT_MULTIPLE_MASTERS_H <ftmm.h> +#define FT_MULTIPLE_MASTERS_H "ftmm.h" /************************************************************************* @@ -639,7 +639,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_SFNT_NAMES_H <ftsnames.h> +#define FT_SFNT_NAMES_H "ftsnames.h" /************************************************************************* @@ -653,7 +653,7 @@ * GPOS, GSUB, JSTF). * */ -#define FT_OPENTYPE_VALIDATE_H <ftotval.h> +#define FT_OPENTYPE_VALIDATE_H "ftotval.h" /************************************************************************* @@ -667,7 +667,7 @@ * mort, morx, bsln, just, kern, opbd, trak, prop). * */ -#define FT_GX_VALIDATE_H <ftgxval.h> +#define FT_GX_VALIDATE_H "ftgxval.h" /************************************************************************* @@ -680,7 +680,7 @@ * FreeType~2 API which accesses PFR-specific data. * */ -#define FT_PFR_H <ftpfr.h> +#define FT_PFR_H "ftpfr.h" /************************************************************************* @@ -692,7 +692,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which provides functions to stroke outline paths. */ -#define FT_STROKER_H <ftstroke.h> +#define FT_STROKER_H "ftstroke.h" /************************************************************************* @@ -704,7 +704,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs artificial obliquing and emboldening. */ -#define FT_SYNTHESIS_H <ftsynth.h> +#define FT_SYNTHESIS_H "ftsynth.h" /************************************************************************* @@ -717,7 +717,7 @@ * FreeType~2 API which provides functions specific to the XFree86 and * X.Org X11 servers. */ -#define FT_XFREE86_H <ftxf86.h> +#define FT_XFREE86_H "ftxf86.h" /************************************************************************* @@ -730,7 +730,7 @@ * FreeType~2 API which performs trigonometric computations (e.g., * cosines and arc tangents). */ -#define FT_TRIGONOMETRY_H <fttrigon.h> +#define FT_TRIGONOMETRY_H "fttrigon.h" /************************************************************************* @@ -742,7 +742,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_LCD_FILTER_H <ftlcdfil.h> +#define FT_LCD_FILTER_H "ftlcdfil.h" /************************************************************************* @@ -754,7 +754,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_UNPATENTED_HINTING_H <ttunpat.h> +#define FT_UNPATENTED_HINTING_H "ttunpat.h" /************************************************************************* @@ -766,7 +766,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_INCREMENTAL_H <ftincrem.h> +#define FT_INCREMENTAL_H "ftincrem.h" /************************************************************************* @@ -778,7 +778,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns entries from the TrueType GASP table. */ -#define FT_GASP_H <ftgasp.h> +#define FT_GASP_H "ftgasp.h" /************************************************************************* @@ -790,38 +790,38 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns individual and ranged glyph advances. */ -#define FT_ADVANCES_H <ftadvanc.h> +#define FT_ADVANCES_H "ftadvanc.h" /* */ -#define FT_ERROR_DEFINITIONS_H <fterrdef.h> +#define FT_ERROR_DEFINITIONS_H "fterrdef.h" /* The internals of the cache sub-system are no longer exposed. We */ /* default to FT_CACHE_H at the moment just in case, but we know of */ /* no rogue client that uses them. */ /* */ -#define FT_CACHE_MANAGER_H <ftcache.h> -#define FT_CACHE_INTERNAL_MRU_H <ftcache.h> -#define FT_CACHE_INTERNAL_MANAGER_H <ftcache.h> -#define FT_CACHE_INTERNAL_CACHE_H <ftcache.h> -#define FT_CACHE_INTERNAL_GLYPH_H <ftcache.h> -#define FT_CACHE_INTERNAL_IMAGE_H <ftcache.h> -#define FT_CACHE_INTERNAL_SBITS_H <ftcache.h> +#define FT_CACHE_MANAGER_H "ftcache.h" +#define FT_CACHE_INTERNAL_MRU_H "ftcache.h" +#define FT_CACHE_INTERNAL_MANAGER_H "ftcache.h" +#define FT_CACHE_INTERNAL_CACHE_H "ftcache.h" +#define FT_CACHE_INTERNAL_GLYPH_H "ftcache.h" +#define FT_CACHE_INTERNAL_IMAGE_H "ftcache.h" +#define FT_CACHE_INTERNAL_SBITS_H "ftcache.h" -#define FT_INCREMENTAL_H <ftincrem.h> +#define FT_INCREMENTAL_H "ftincrem.h" -#define FT_TRUETYPE_UNPATENTED_H <ttunpat.h> +#define FT_TRUETYPE_UNPATENTED_H "ttunpat.h" /* - * Include internal headers definitions from <internal/...> + * Include internal headers definitions from "internal/..." * only when building the library. */ #ifdef FT2_BUILD_LIBRARY -#define FT_INTERNAL_INTERNAL_H <internal/internal.h> +#define FT_INTERNAL_INTERNAL_H "internal/internal.h" #include FT_INTERNAL_INTERNAL_H #endif /* FT2_BUILD_LIBRARY */ diff --git a/freetype2/include/ios/freetype2/config/ftoption.h b/freetype2/include/ios/freetype2/config/ftoption.h index 2b0b67e7af..bd02219f59 100755 --- a/freetype2/include/ios/freetype2/config/ftoption.h +++ b/freetype2/include/ios/freetype2/config/ftoption.h @@ -20,7 +20,7 @@ #define __FTOPTION_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/ios/freetype2/freetype.h b/freetype2/include/ios/freetype2/freetype.h index 27fd44bfc2..6c42b6629a 100755 --- a/freetype2/include/ios/freetype2/freetype.h +++ b/freetype2/include/ios/freetype2/freetype.h @@ -29,7 +29,7 @@ #endif -#include <ft2build.h> +#include "ft2build.h" #include FT_CONFIG_CONFIG_H #include FT_TYPES_H #include FT_ERRORS_H diff --git a/freetype2/include/ios/freetype2/ft2build.h b/freetype2/include/ios/freetype2/ft2build.h index 6f8eb7f373..de7ef590b3 100755 --- a/freetype2/include/ios/freetype2/ft2build.h +++ b/freetype2/include/ios/freetype2/ft2build.h @@ -34,7 +34,7 @@ #ifndef __FT2BUILD_H__ #define __FT2BUILD_H__ -#include <config/ftheader.h> +#include "config/ftheader.h" #endif /* __FT2BUILD_H__ */ diff --git a/freetype2/include/ios/freetype2/ftadvanc.h b/freetype2/include/ios/freetype2/ftadvanc.h index 955f93fa16..a21d8ea89a 100755 --- a/freetype2/include/ios/freetype2/ftadvanc.h +++ b/freetype2/include/ios/freetype2/ftadvanc.h @@ -20,7 +20,7 @@ #define __FTADVANC_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftautoh.h b/freetype2/include/ios/freetype2/ftautoh.h index 59191abbfe..1527cb5280 100755 --- a/freetype2/include/ios/freetype2/ftautoh.h +++ b/freetype2/include/ios/freetype2/ftautoh.h @@ -19,7 +19,7 @@ #ifndef __FTAUTOH_H__ #define __FTAUTOH_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftbbox.h b/freetype2/include/ios/freetype2/ftbbox.h index d6800e240f..9d6f2d9e47 100755 --- a/freetype2/include/ios/freetype2/ftbbox.h +++ b/freetype2/include/ios/freetype2/ftbbox.h @@ -31,7 +31,7 @@ #define __FTBBOX_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftbdf.h b/freetype2/include/ios/freetype2/ftbdf.h index 6d262e4141..48ff4ab3cf 100755 --- a/freetype2/include/ios/freetype2/ftbdf.h +++ b/freetype2/include/ios/freetype2/ftbdf.h @@ -19,7 +19,7 @@ #ifndef __FTBDF_H__ #define __FTBDF_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftbitmap.h b/freetype2/include/ios/freetype2/ftbitmap.h index eae716904b..75a4bf0660 100755 --- a/freetype2/include/ios/freetype2/ftbitmap.h +++ b/freetype2/include/ios/freetype2/ftbitmap.h @@ -20,7 +20,7 @@ #define __FTBITMAP_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftbzip2.h b/freetype2/include/ios/freetype2/ftbzip2.h index 4dce161fd6..37806b328e 100755 --- a/freetype2/include/ios/freetype2/ftbzip2.h +++ b/freetype2/include/ios/freetype2/ftbzip2.h @@ -19,7 +19,7 @@ #ifndef __FTBZIP2_H__ #define __FTBZIP2_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftcache.h b/freetype2/include/ios/freetype2/ftcache.h index a30e925cc5..66f31eec81 100755 --- a/freetype2/include/ios/freetype2/ftcache.h +++ b/freetype2/include/ios/freetype2/ftcache.h @@ -20,7 +20,7 @@ #define __FTCACHE_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_GLYPH_H diff --git a/freetype2/include/ios/freetype2/ftcffdrv.h b/freetype2/include/ios/freetype2/ftcffdrv.h index f7031bc883..f87a8287bf 100755 --- a/freetype2/include/ios/freetype2/ftcffdrv.h +++ b/freetype2/include/ios/freetype2/ftcffdrv.h @@ -19,7 +19,7 @@ #ifndef __FTCFFDRV_H__ #define __FTCFFDRV_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftcid.h b/freetype2/include/ios/freetype2/ftcid.h index 17550d87b5..82bca1d0dc 100755 --- a/freetype2/include/ios/freetype2/ftcid.h +++ b/freetype2/include/ios/freetype2/ftcid.h @@ -18,7 +18,7 @@ #ifndef __FTCID_H__ #define __FTCID_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftgasp.h b/freetype2/include/ios/freetype2/ftgasp.h index 3f3d765467..f58f3f8a42 100755 --- a/freetype2/include/ios/freetype2/ftgasp.h +++ b/freetype2/include/ios/freetype2/ftgasp.h @@ -19,7 +19,7 @@ #ifndef _FT_GASP_H_ #define _FT_GASP_H_ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftglyph.h b/freetype2/include/ios/freetype2/ftglyph.h index 15fa6a9950..f0bfd035fa 100755 --- a/freetype2/include/ios/freetype2/ftglyph.h +++ b/freetype2/include/ios/freetype2/ftglyph.h @@ -33,7 +33,7 @@ #define __FTGLYPH_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftgxval.h b/freetype2/include/ios/freetype2/ftgxval.h index 88c3d93750..757ab3c534 100755 --- a/freetype2/include/ios/freetype2/ftgxval.h +++ b/freetype2/include/ios/freetype2/ftgxval.h @@ -28,7 +28,7 @@ #ifndef __FTGXVAL_H__ #define __FTGXVAL_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftgzip.h b/freetype2/include/ios/freetype2/ftgzip.h index eb346c6dc7..488d040c3a 100755 --- a/freetype2/include/ios/freetype2/ftgzip.h +++ b/freetype2/include/ios/freetype2/ftgzip.h @@ -19,7 +19,7 @@ #ifndef __FTGZIP_H__ #define __FTGZIP_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftimage.h b/freetype2/include/ios/freetype2/ftimage.h index 2f7ca2aaf5..607e0242e4 100755 --- a/freetype2/include/ios/freetype2/ftimage.h +++ b/freetype2/include/ios/freetype2/ftimage.h @@ -30,7 +30,7 @@ /* _STANDALONE_ is from ftgrays.c */ #ifndef _STANDALONE_ -#include <ft2build.h> +#include "ft2build.h" #endif diff --git a/freetype2/include/ios/freetype2/ftincrem.h b/freetype2/include/ios/freetype2/ftincrem.h index 4c0246c5df..ad7e01861f 100755 --- a/freetype2/include/ios/freetype2/ftincrem.h +++ b/freetype2/include/ios/freetype2/ftincrem.h @@ -19,7 +19,7 @@ #ifndef __FTINCREM_H__ #define __FTINCREM_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftlcdfil.h b/freetype2/include/ios/freetype2/ftlcdfil.h index e8679c1a3f..34b0441845 100755 --- a/freetype2/include/ios/freetype2/ftlcdfil.h +++ b/freetype2/include/ios/freetype2/ftlcdfil.h @@ -20,7 +20,7 @@ #ifndef __FT_LCD_FILTER_H__ #define __FT_LCD_FILTER_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftlist.h b/freetype2/include/ios/freetype2/ftlist.h index 9950a27997..05425a2936 100755 --- a/freetype2/include/ios/freetype2/ftlist.h +++ b/freetype2/include/ios/freetype2/ftlist.h @@ -28,7 +28,7 @@ #define __FTLIST_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftlzw.h b/freetype2/include/ios/freetype2/ftlzw.h index 857c0c52bb..8e2f0422c2 100755 --- a/freetype2/include/ios/freetype2/ftlzw.h +++ b/freetype2/include/ios/freetype2/ftlzw.h @@ -19,7 +19,7 @@ #ifndef __FTLZW_H__ #define __FTLZW_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftmac.h b/freetype2/include/ios/freetype2/ftmac.h index 42874fe6fc..7129093030 100755 --- a/freetype2/include/ios/freetype2/ftmac.h +++ b/freetype2/include/ios/freetype2/ftmac.h @@ -29,7 +29,7 @@ #define __FTMAC_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/ios/freetype2/ftmm.h b/freetype2/include/ios/freetype2/ftmm.h index 2dcfd678df..00f1813f39 100755 --- a/freetype2/include/ios/freetype2/ftmm.h +++ b/freetype2/include/ios/freetype2/ftmm.h @@ -20,7 +20,7 @@ #define __FTMM_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_TYPE1_TABLES_H diff --git a/freetype2/include/ios/freetype2/ftmodapi.h b/freetype2/include/ios/freetype2/ftmodapi.h index 980f15d3de..833b1f1204 100755 --- a/freetype2/include/ios/freetype2/ftmodapi.h +++ b/freetype2/include/ios/freetype2/ftmodapi.h @@ -20,7 +20,7 @@ #define __FTMODAPI_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftotval.h b/freetype2/include/ios/freetype2/ftotval.h index 75ba03ee8e..02f65e9199 100755 --- a/freetype2/include/ios/freetype2/ftotval.h +++ b/freetype2/include/ios/freetype2/ftotval.h @@ -30,7 +30,7 @@ #ifndef __FTOTVAL_H__ #define __FTOTVAL_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftoutln.h b/freetype2/include/ios/freetype2/ftoutln.h index d3b8fbd265..b9f2c87ff1 100755 --- a/freetype2/include/ios/freetype2/ftoutln.h +++ b/freetype2/include/ios/freetype2/ftoutln.h @@ -21,7 +21,7 @@ #define __FTOUTLN_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftpfr.h b/freetype2/include/ios/freetype2/ftpfr.h index 7d5035396b..bb1ea1ac5e 100755 --- a/freetype2/include/ios/freetype2/ftpfr.h +++ b/freetype2/include/ios/freetype2/ftpfr.h @@ -19,7 +19,7 @@ #ifndef __FTPFR_H__ #define __FTPFR_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftrender.h b/freetype2/include/ios/freetype2/ftrender.h index e8d36363ca..44e4475271 100755 --- a/freetype2/include/ios/freetype2/ftrender.h +++ b/freetype2/include/ios/freetype2/ftrender.h @@ -20,7 +20,7 @@ #define __FTRENDER_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_MODULE_H #include FT_GLYPH_H diff --git a/freetype2/include/ios/freetype2/ftsizes.h b/freetype2/include/ios/freetype2/ftsizes.h index 4167045701..90ab4930af 100755 --- a/freetype2/include/ios/freetype2/ftsizes.h +++ b/freetype2/include/ios/freetype2/ftsizes.h @@ -29,7 +29,7 @@ #define __FTSIZES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftsnames.h b/freetype2/include/ios/freetype2/ftsnames.h index 88af440356..909dcb4d56 100755 --- a/freetype2/include/ios/freetype2/ftsnames.h +++ b/freetype2/include/ios/freetype2/ftsnames.h @@ -23,7 +23,7 @@ #define __FT_SFNT_NAMES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftstroke.h b/freetype2/include/ios/freetype2/ftstroke.h index bd311709f3..5f95001552 100755 --- a/freetype2/include/ios/freetype2/ftstroke.h +++ b/freetype2/include/ios/freetype2/ftstroke.h @@ -19,7 +19,7 @@ #ifndef __FT_STROKE_H__ #define __FT_STROKE_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_OUTLINE_H #include FT_GLYPH_H diff --git a/freetype2/include/ios/freetype2/ftsynth.h b/freetype2/include/ios/freetype2/ftsynth.h index d0ea730874..1fcfce45dc 100755 --- a/freetype2/include/ios/freetype2/ftsynth.h +++ b/freetype2/include/ios/freetype2/ftsynth.h @@ -45,7 +45,7 @@ #define __FTSYNTH_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftsystem.h b/freetype2/include/ios/freetype2/ftsystem.h index 7436ed2678..afebcbb8f0 100755 --- a/freetype2/include/ios/freetype2/ftsystem.h +++ b/freetype2/include/ios/freetype2/ftsystem.h @@ -20,7 +20,7 @@ #define __FTSYSTEM_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/ios/freetype2/ftttdrv.h b/freetype2/include/ios/freetype2/ftttdrv.h index 358841397c..68e22677e7 100755 --- a/freetype2/include/ios/freetype2/ftttdrv.h +++ b/freetype2/include/ios/freetype2/ftttdrv.h @@ -20,7 +20,7 @@ #ifndef __FTTTDRV_H__ #define __FTTTDRV_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/fttypes.h b/freetype2/include/ios/freetype2/fttypes.h index 2c01e8737c..337e1261c4 100755 --- a/freetype2/include/ios/freetype2/fttypes.h +++ b/freetype2/include/ios/freetype2/fttypes.h @@ -20,7 +20,7 @@ #define __FTTYPES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_CONFIG_CONFIG_H #include FT_SYSTEM_H #include FT_IMAGE_H diff --git a/freetype2/include/ios/freetype2/ftwinfnt.h b/freetype2/include/ios/freetype2/ftwinfnt.h index 50261581a2..b3a6d36fc2 100755 --- a/freetype2/include/ios/freetype2/ftwinfnt.h +++ b/freetype2/include/ios/freetype2/ftwinfnt.h @@ -19,7 +19,7 @@ #ifndef __FTWINFNT_H__ #define __FTWINFNT_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ftxf86.h b/freetype2/include/ios/freetype2/ftxf86.h index 89d1993e1e..e9f1caf0b2 100755 --- a/freetype2/include/ios/freetype2/ftxf86.h +++ b/freetype2/include/ios/freetype2/ftxf86.h @@ -19,7 +19,7 @@ #ifndef __FTXF86_H__ #define __FTXF86_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/t1tables.h b/freetype2/include/ios/freetype2/t1tables.h index 61aefdd541..51d7a2e281 100755 --- a/freetype2/include/ios/freetype2/t1tables.h +++ b/freetype2/include/ios/freetype2/t1tables.h @@ -21,7 +21,7 @@ #define __T1TABLES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ttnameid.h b/freetype2/include/ios/freetype2/ttnameid.h index e65b558127..d680e8ba9a 100755 --- a/freetype2/include/ios/freetype2/ttnameid.h +++ b/freetype2/include/ios/freetype2/ttnameid.h @@ -20,7 +20,7 @@ #define __TTNAMEID_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/ios/freetype2/tttables.h b/freetype2/include/ios/freetype2/tttables.h index e1d8b05e79..cf074ef8df 100755 --- a/freetype2/include/ios/freetype2/tttables.h +++ b/freetype2/include/ios/freetype2/tttables.h @@ -21,7 +21,7 @@ #define __TTTABLES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/tttags.h b/freetype2/include/ios/freetype2/tttags.h index d59aa19a33..089ff40d96 100755 --- a/freetype2/include/ios/freetype2/tttags.h +++ b/freetype2/include/ios/freetype2/tttags.h @@ -20,7 +20,7 @@ #define __TTAGS_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/ios/freetype2/ttunpat.h b/freetype2/include/ios/freetype2/ttunpat.h index bf53ddd528..4390aa7ee4 100755 --- a/freetype2/include/ios/freetype2/ttunpat.h +++ b/freetype2/include/ios/freetype2/ttunpat.h @@ -22,7 +22,7 @@ #define __TTUNPAT_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/config/ftconfig.h b/freetype2/include/mac/freetype2/config/ftconfig.h index 0c8844ec2b..792ba94c01 100755 --- a/freetype2/include/mac/freetype2/config/ftconfig.h +++ b/freetype2/include/mac/freetype2/config/ftconfig.h @@ -38,7 +38,7 @@ #ifndef __FTCONFIG_H__ #define __FTCONFIG_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_CONFIG_OPTIONS_H #include FT_CONFIG_STANDARD_LIBRARY_H diff --git a/freetype2/include/mac/freetype2/config/ftheader.h b/freetype2/include/mac/freetype2/config/ftheader.h index b623629921..f51cd10bb6 100755 --- a/freetype2/include/mac/freetype2/config/ftheader.h +++ b/freetype2/include/mac/freetype2/config/ftheader.h @@ -21,10 +21,10 @@ /*@***********************************************************************/ /* */ - /* <Macro> */ + /* "Macro" */ /* FT_BEGIN_HEADER */ /* */ - /* <Description> */ + /* "Description" */ /* This macro is used in association with @FT_END_HEADER in header */ /* files to ensure that the declarations within are properly */ /* encapsulated in an `extern "C" { .. }' block when included from a */ @@ -39,10 +39,10 @@ /*@***********************************************************************/ /* */ - /* <Macro> */ + /* "Macro" */ /* FT_END_HEADER */ /* */ - /* <Description> */ + /* "Description" */ /* This macro is used in association with @FT_BEGIN_HEADER in header */ /* files to ensure that the declarations within are properly */ /* encapsulated in an `extern "C" { .. }' block when included from a */ @@ -63,16 +63,16 @@ /*************************************************************************/ /* */ - /* <Section> */ + /* "Section" */ /* header_file_macros */ /* */ - /* <Title> */ + /* "Title" */ /* Header File Macros */ /* */ - /* <Abstract> */ + /* "Abstract" */ /* Macro definitions used to #include specific header files. */ /* */ - /* <Description> */ + /* "Description" */ /* The following macros are defined to the name of specific */ /* FreeType~2 header files. They can be used directly in #include */ /* statements as in: */ @@ -107,7 +107,7 @@ * */ #ifndef FT_CONFIG_CONFIG_H -#define FT_CONFIG_CONFIG_H <config/ftconfig.h> +#define FT_CONFIG_CONFIG_H "config/ftconfig.h" #endif @@ -122,7 +122,7 @@ * */ #ifndef FT_CONFIG_STANDARD_LIBRARY_H -#define FT_CONFIG_STANDARD_LIBRARY_H <config/ftstdlib.h> +#define FT_CONFIG_STANDARD_LIBRARY_H "config/ftstdlib.h" #endif @@ -137,7 +137,7 @@ * */ #ifndef FT_CONFIG_OPTIONS_H -#define FT_CONFIG_OPTIONS_H <config/ftoption.h> +#define FT_CONFIG_OPTIONS_H "config/ftoption.h" #endif @@ -153,7 +153,7 @@ * */ #ifndef FT_CONFIG_MODULES_H -#define FT_CONFIG_MODULES_H <config/ftmodule.h> +#define FT_CONFIG_MODULES_H "config/ftmodule.h" #endif /* */ @@ -170,7 +170,7 @@ * base FreeType~2 API. * */ -#define FT_FREETYPE_H <freetype.h> +#define FT_FREETYPE_H "freetype.h" /************************************************************************* @@ -185,7 +185,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_ERRORS_H <fterrors.h> +#define FT_ERRORS_H "fterrors.h" /************************************************************************* @@ -198,7 +198,7 @@ * list of FreeType~2 module error offsets (and messages). * */ -#define FT_MODULE_ERRORS_H <ftmoderr.h> +#define FT_MODULE_ERRORS_H "ftmoderr.h" /************************************************************************* @@ -214,7 +214,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_SYSTEM_H <ftsystem.h> +#define FT_SYSTEM_H "ftsystem.h" /************************************************************************* @@ -230,7 +230,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_IMAGE_H <ftimage.h> +#define FT_IMAGE_H "ftimage.h" /************************************************************************* @@ -245,7 +245,7 @@ * It is included by @FT_FREETYPE_H. * */ -#define FT_TYPES_H <fttypes.h> +#define FT_TYPES_H "fttypes.h" /************************************************************************* @@ -260,7 +260,7 @@ * (Most applications will never need to include this file.) * */ -#define FT_LIST_H <ftlist.h> +#define FT_LIST_H "ftlist.h" /************************************************************************* @@ -273,7 +273,7 @@ * scalable outline management API of FreeType~2. * */ -#define FT_OUTLINE_H <ftoutln.h> +#define FT_OUTLINE_H "ftoutln.h" /************************************************************************* @@ -286,7 +286,7 @@ * API which manages multiple @FT_Size objects per face. * */ -#define FT_SIZES_H <ftsizes.h> +#define FT_SIZES_H "ftsizes.h" /************************************************************************* @@ -299,7 +299,7 @@ * module management API of FreeType~2. * */ -#define FT_MODULE_H <ftmodapi.h> +#define FT_MODULE_H "ftmodapi.h" /************************************************************************* @@ -312,7 +312,7 @@ * renderer module management API of FreeType~2. * */ -#define FT_RENDER_H <ftrender.h> +#define FT_RENDER_H "ftrender.h" /************************************************************************* @@ -325,7 +325,7 @@ * structures and macros related to the auto-hinting module. * */ -#define FT_AUTOHINTER_H <ftautoh.h> +#define FT_AUTOHINTER_H "ftautoh.h" /************************************************************************* @@ -338,7 +338,7 @@ * structures and macros related to the CFF driver module. * */ -#define FT_CFF_DRIVER_H <ftcffdrv.h> +#define FT_CFF_DRIVER_H "ftcffdrv.h" /************************************************************************* @@ -351,7 +351,7 @@ * structures and macros related to the TrueType driver module. * */ -#define FT_TRUETYPE_DRIVER_H <ftttdrv.h> +#define FT_TRUETYPE_DRIVER_H "ftttdrv.h" /************************************************************************* @@ -364,7 +364,7 @@ * types and API specific to the Type~1 format. * */ -#define FT_TYPE1_TABLES_H <t1tables.h> +#define FT_TYPE1_TABLES_H "t1tables.h" /************************************************************************* @@ -379,7 +379,7 @@ * definitions, taken from the TrueType and OpenType specifications. * */ -#define FT_TRUETYPE_IDS_H <ttnameid.h> +#define FT_TRUETYPE_IDS_H "ttnameid.h" /************************************************************************* @@ -392,7 +392,7 @@ * types and API specific to the TrueType (as well as OpenType) format. * */ -#define FT_TRUETYPE_TABLES_H <tttables.h> +#define FT_TRUETYPE_TABLES_H "tttables.h" /************************************************************************* @@ -406,7 +406,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_TRUETYPE_TAGS_H <tttags.h> +#define FT_TRUETYPE_TAGS_H "tttags.h" /************************************************************************* @@ -420,7 +420,7 @@ * face. * */ -#define FT_BDF_H <ftbdf.h> +#define FT_BDF_H "ftbdf.h" /************************************************************************* @@ -434,7 +434,7 @@ * face. * */ -#define FT_CID_H <ftcid.h> +#define FT_CID_H "ftcid.h" /************************************************************************* @@ -447,7 +447,7 @@ * definitions of an API which supports gzip-compressed files. * */ -#define FT_GZIP_H <ftgzip.h> +#define FT_GZIP_H "ftgzip.h" /************************************************************************* @@ -460,7 +460,7 @@ * definitions of an API which supports LZW-compressed files. * */ -#define FT_LZW_H <ftlzw.h> +#define FT_LZW_H "ftlzw.h" /************************************************************************* @@ -473,7 +473,7 @@ * definitions of an API which supports bzip2-compressed files. * */ -#define FT_BZIP2_H <ftbzip2.h> +#define FT_BZIP2_H "ftbzip2.h" /************************************************************************* @@ -486,7 +486,7 @@ * definitions of an API which supports Windows FNT files. * */ -#define FT_WINFONTS_H <ftwinfnt.h> +#define FT_WINFONTS_H "ftwinfnt.h" /************************************************************************* @@ -499,7 +499,7 @@ * API of the optional glyph management component. * */ -#define FT_GLYPH_H <ftglyph.h> +#define FT_GLYPH_H "ftglyph.h" /************************************************************************* @@ -512,7 +512,7 @@ * API of the optional bitmap conversion component. * */ -#define FT_BITMAP_H <ftbitmap.h> +#define FT_BITMAP_H "ftbitmap.h" /************************************************************************* @@ -525,7 +525,7 @@ * API of the optional exact bounding box computation routines. * */ -#define FT_BBOX_H <ftbbox.h> +#define FT_BBOX_H "ftbbox.h" /************************************************************************* @@ -538,7 +538,7 @@ * API of the optional FreeType~2 cache sub-system. * */ -#define FT_CACHE_H <ftcache.h> +#define FT_CACHE_H "ftcache.h" /************************************************************************* @@ -612,7 +612,7 @@ * compiled on the Mac (note that the base API still works though). * */ -#define FT_MAC_H <ftmac.h> +#define FT_MAC_H "ftmac.h" /************************************************************************* @@ -625,7 +625,7 @@ * optional multiple-masters management API of FreeType~2. * */ -#define FT_MULTIPLE_MASTERS_H <ftmm.h> +#define FT_MULTIPLE_MASTERS_H "ftmm.h" /************************************************************************* @@ -639,7 +639,7 @@ * SFNT-based font formats (i.e., TrueType and OpenType). * */ -#define FT_SFNT_NAMES_H <ftsnames.h> +#define FT_SFNT_NAMES_H "ftsnames.h" /************************************************************************* @@ -653,7 +653,7 @@ * GPOS, GSUB, JSTF). * */ -#define FT_OPENTYPE_VALIDATE_H <ftotval.h> +#define FT_OPENTYPE_VALIDATE_H "ftotval.h" /************************************************************************* @@ -667,7 +667,7 @@ * mort, morx, bsln, just, kern, opbd, trak, prop). * */ -#define FT_GX_VALIDATE_H <ftgxval.h> +#define FT_GX_VALIDATE_H "ftgxval.h" /************************************************************************* @@ -680,7 +680,7 @@ * FreeType~2 API which accesses PFR-specific data. * */ -#define FT_PFR_H <ftpfr.h> +#define FT_PFR_H "ftpfr.h" /************************************************************************* @@ -692,7 +692,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which provides functions to stroke outline paths. */ -#define FT_STROKER_H <ftstroke.h> +#define FT_STROKER_H "ftstroke.h" /************************************************************************* @@ -704,7 +704,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs artificial obliquing and emboldening. */ -#define FT_SYNTHESIS_H <ftsynth.h> +#define FT_SYNTHESIS_H "ftsynth.h" /************************************************************************* @@ -717,7 +717,7 @@ * FreeType~2 API which provides functions specific to the XFree86 and * X.Org X11 servers. */ -#define FT_XFREE86_H <ftxf86.h> +#define FT_XFREE86_H "ftxf86.h" /************************************************************************* @@ -730,7 +730,7 @@ * FreeType~2 API which performs trigonometric computations (e.g., * cosines and arc tangents). */ -#define FT_TRIGONOMETRY_H <fttrigon.h> +#define FT_TRIGONOMETRY_H "fttrigon.h" /************************************************************************* @@ -742,7 +742,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_LCD_FILTER_H <ftlcdfil.h> +#define FT_LCD_FILTER_H "ftlcdfil.h" /************************************************************************* @@ -754,7 +754,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_UNPATENTED_HINTING_H <ttunpat.h> +#define FT_UNPATENTED_HINTING_H "ttunpat.h" /************************************************************************* @@ -766,7 +766,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which performs color filtering for subpixel rendering. */ -#define FT_INCREMENTAL_H <ftincrem.h> +#define FT_INCREMENTAL_H "ftincrem.h" /************************************************************************* @@ -778,7 +778,7 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns entries from the TrueType GASP table. */ -#define FT_GASP_H <ftgasp.h> +#define FT_GASP_H "ftgasp.h" /************************************************************************* @@ -790,38 +790,38 @@ * A macro used in #include statements to name the file containing the * FreeType~2 API which returns individual and ranged glyph advances. */ -#define FT_ADVANCES_H <ftadvanc.h> +#define FT_ADVANCES_H "ftadvanc.h" /* */ -#define FT_ERROR_DEFINITIONS_H <fterrdef.h> +#define FT_ERROR_DEFINITIONS_H "fterrdef.h" /* The internals of the cache sub-system are no longer exposed. We */ /* default to FT_CACHE_H at the moment just in case, but we know of */ /* no rogue client that uses them. */ /* */ -#define FT_CACHE_MANAGER_H <ftcache.h> -#define FT_CACHE_INTERNAL_MRU_H <ftcache.h> -#define FT_CACHE_INTERNAL_MANAGER_H <ftcache.h> -#define FT_CACHE_INTERNAL_CACHE_H <ftcache.h> -#define FT_CACHE_INTERNAL_GLYPH_H <ftcache.h> -#define FT_CACHE_INTERNAL_IMAGE_H <ftcache.h> -#define FT_CACHE_INTERNAL_SBITS_H <ftcache.h> +#define FT_CACHE_MANAGER_H "ftcache.h" +#define FT_CACHE_INTERNAL_MRU_H "ftcache.h" +#define FT_CACHE_INTERNAL_MANAGER_H "ftcache.h" +#define FT_CACHE_INTERNAL_CACHE_H "ftcache.h" +#define FT_CACHE_INTERNAL_GLYPH_H "ftcache.h" +#define FT_CACHE_INTERNAL_IMAGE_H "ftcache.h" +#define FT_CACHE_INTERNAL_SBITS_H "ftcache.h" -#define FT_INCREMENTAL_H <ftincrem.h> +#define FT_INCREMENTAL_H "ftincrem.h" -#define FT_TRUETYPE_UNPATENTED_H <ttunpat.h> +#define FT_TRUETYPE_UNPATENTED_H "ttunpat.h" /* - * Include internal headers definitions from <internal/...> + * Include internal headers definitions from "internal/..." * only when building the library. */ #ifdef FT2_BUILD_LIBRARY -#define FT_INTERNAL_INTERNAL_H <internal/internal.h> +#define FT_INTERNAL_INTERNAL_H "internal/internal.h" #include FT_INTERNAL_INTERNAL_H #endif /* FT2_BUILD_LIBRARY */ diff --git a/freetype2/include/mac/freetype2/config/ftoption.h b/freetype2/include/mac/freetype2/config/ftoption.h index 2b0b67e7af..bd02219f59 100755 --- a/freetype2/include/mac/freetype2/config/ftoption.h +++ b/freetype2/include/mac/freetype2/config/ftoption.h @@ -20,7 +20,7 @@ #define __FTOPTION_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/mac/freetype2/freetype.h b/freetype2/include/mac/freetype2/freetype.h index 27fd44bfc2..6c42b6629a 100755 --- a/freetype2/include/mac/freetype2/freetype.h +++ b/freetype2/include/mac/freetype2/freetype.h @@ -29,7 +29,7 @@ #endif -#include <ft2build.h> +#include "ft2build.h" #include FT_CONFIG_CONFIG_H #include FT_TYPES_H #include FT_ERRORS_H diff --git a/freetype2/include/mac/freetype2/ft2build.h b/freetype2/include/mac/freetype2/ft2build.h index 6f8eb7f373..de7ef590b3 100755 --- a/freetype2/include/mac/freetype2/ft2build.h +++ b/freetype2/include/mac/freetype2/ft2build.h @@ -34,7 +34,7 @@ #ifndef __FT2BUILD_H__ #define __FT2BUILD_H__ -#include <config/ftheader.h> +#include "config/ftheader.h" #endif /* __FT2BUILD_H__ */ diff --git a/freetype2/include/mac/freetype2/ftadvanc.h b/freetype2/include/mac/freetype2/ftadvanc.h index 955f93fa16..a21d8ea89a 100755 --- a/freetype2/include/mac/freetype2/ftadvanc.h +++ b/freetype2/include/mac/freetype2/ftadvanc.h @@ -20,7 +20,7 @@ #define __FTADVANC_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftautoh.h b/freetype2/include/mac/freetype2/ftautoh.h index 59191abbfe..1527cb5280 100755 --- a/freetype2/include/mac/freetype2/ftautoh.h +++ b/freetype2/include/mac/freetype2/ftautoh.h @@ -19,7 +19,7 @@ #ifndef __FTAUTOH_H__ #define __FTAUTOH_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftbbox.h b/freetype2/include/mac/freetype2/ftbbox.h index d6800e240f..9d6f2d9e47 100755 --- a/freetype2/include/mac/freetype2/ftbbox.h +++ b/freetype2/include/mac/freetype2/ftbbox.h @@ -31,7 +31,7 @@ #define __FTBBOX_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftbdf.h b/freetype2/include/mac/freetype2/ftbdf.h index 6d262e4141..48ff4ab3cf 100755 --- a/freetype2/include/mac/freetype2/ftbdf.h +++ b/freetype2/include/mac/freetype2/ftbdf.h @@ -19,7 +19,7 @@ #ifndef __FTBDF_H__ #define __FTBDF_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftbitmap.h b/freetype2/include/mac/freetype2/ftbitmap.h index eae716904b..75a4bf0660 100755 --- a/freetype2/include/mac/freetype2/ftbitmap.h +++ b/freetype2/include/mac/freetype2/ftbitmap.h @@ -20,7 +20,7 @@ #define __FTBITMAP_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftbzip2.h b/freetype2/include/mac/freetype2/ftbzip2.h index 4dce161fd6..37806b328e 100755 --- a/freetype2/include/mac/freetype2/ftbzip2.h +++ b/freetype2/include/mac/freetype2/ftbzip2.h @@ -19,7 +19,7 @@ #ifndef __FTBZIP2_H__ #define __FTBZIP2_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftcache.h b/freetype2/include/mac/freetype2/ftcache.h index a30e925cc5..66f31eec81 100755 --- a/freetype2/include/mac/freetype2/ftcache.h +++ b/freetype2/include/mac/freetype2/ftcache.h @@ -20,7 +20,7 @@ #define __FTCACHE_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_GLYPH_H diff --git a/freetype2/include/mac/freetype2/ftcffdrv.h b/freetype2/include/mac/freetype2/ftcffdrv.h index f7031bc883..f87a8287bf 100755 --- a/freetype2/include/mac/freetype2/ftcffdrv.h +++ b/freetype2/include/mac/freetype2/ftcffdrv.h @@ -19,7 +19,7 @@ #ifndef __FTCFFDRV_H__ #define __FTCFFDRV_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftcid.h b/freetype2/include/mac/freetype2/ftcid.h index 17550d87b5..82bca1d0dc 100755 --- a/freetype2/include/mac/freetype2/ftcid.h +++ b/freetype2/include/mac/freetype2/ftcid.h @@ -18,7 +18,7 @@ #ifndef __FTCID_H__ #define __FTCID_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftgasp.h b/freetype2/include/mac/freetype2/ftgasp.h index 3f3d765467..f58f3f8a42 100755 --- a/freetype2/include/mac/freetype2/ftgasp.h +++ b/freetype2/include/mac/freetype2/ftgasp.h @@ -19,7 +19,7 @@ #ifndef _FT_GASP_H_ #define _FT_GASP_H_ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftglyph.h b/freetype2/include/mac/freetype2/ftglyph.h index 15fa6a9950..f0bfd035fa 100755 --- a/freetype2/include/mac/freetype2/ftglyph.h +++ b/freetype2/include/mac/freetype2/ftglyph.h @@ -33,7 +33,7 @@ #define __FTGLYPH_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftgxval.h b/freetype2/include/mac/freetype2/ftgxval.h index 88c3d93750..757ab3c534 100755 --- a/freetype2/include/mac/freetype2/ftgxval.h +++ b/freetype2/include/mac/freetype2/ftgxval.h @@ -28,7 +28,7 @@ #ifndef __FTGXVAL_H__ #define __FTGXVAL_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftgzip.h b/freetype2/include/mac/freetype2/ftgzip.h index eb346c6dc7..488d040c3a 100755 --- a/freetype2/include/mac/freetype2/ftgzip.h +++ b/freetype2/include/mac/freetype2/ftgzip.h @@ -19,7 +19,7 @@ #ifndef __FTGZIP_H__ #define __FTGZIP_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftimage.h b/freetype2/include/mac/freetype2/ftimage.h index 2f7ca2aaf5..607e0242e4 100755 --- a/freetype2/include/mac/freetype2/ftimage.h +++ b/freetype2/include/mac/freetype2/ftimage.h @@ -30,7 +30,7 @@ /* _STANDALONE_ is from ftgrays.c */ #ifndef _STANDALONE_ -#include <ft2build.h> +#include "ft2build.h" #endif diff --git a/freetype2/include/mac/freetype2/ftincrem.h b/freetype2/include/mac/freetype2/ftincrem.h index 4c0246c5df..ad7e01861f 100755 --- a/freetype2/include/mac/freetype2/ftincrem.h +++ b/freetype2/include/mac/freetype2/ftincrem.h @@ -19,7 +19,7 @@ #ifndef __FTINCREM_H__ #define __FTINCREM_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftlcdfil.h b/freetype2/include/mac/freetype2/ftlcdfil.h index e8679c1a3f..34b0441845 100755 --- a/freetype2/include/mac/freetype2/ftlcdfil.h +++ b/freetype2/include/mac/freetype2/ftlcdfil.h @@ -20,7 +20,7 @@ #ifndef __FT_LCD_FILTER_H__ #define __FT_LCD_FILTER_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftlist.h b/freetype2/include/mac/freetype2/ftlist.h index 9950a27997..05425a2936 100755 --- a/freetype2/include/mac/freetype2/ftlist.h +++ b/freetype2/include/mac/freetype2/ftlist.h @@ -28,7 +28,7 @@ #define __FTLIST_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftlzw.h b/freetype2/include/mac/freetype2/ftlzw.h index 857c0c52bb..8e2f0422c2 100755 --- a/freetype2/include/mac/freetype2/ftlzw.h +++ b/freetype2/include/mac/freetype2/ftlzw.h @@ -19,7 +19,7 @@ #ifndef __FTLZW_H__ #define __FTLZW_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftmac.h b/freetype2/include/mac/freetype2/ftmac.h index 42874fe6fc..7129093030 100755 --- a/freetype2/include/mac/freetype2/ftmac.h +++ b/freetype2/include/mac/freetype2/ftmac.h @@ -29,7 +29,7 @@ #define __FTMAC_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/mac/freetype2/ftmm.h b/freetype2/include/mac/freetype2/ftmm.h index 2dcfd678df..00f1813f39 100755 --- a/freetype2/include/mac/freetype2/ftmm.h +++ b/freetype2/include/mac/freetype2/ftmm.h @@ -20,7 +20,7 @@ #define __FTMM_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_TYPE1_TABLES_H diff --git a/freetype2/include/mac/freetype2/ftmodapi.h b/freetype2/include/mac/freetype2/ftmodapi.h index 980f15d3de..833b1f1204 100755 --- a/freetype2/include/mac/freetype2/ftmodapi.h +++ b/freetype2/include/mac/freetype2/ftmodapi.h @@ -20,7 +20,7 @@ #define __FTMODAPI_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftotval.h b/freetype2/include/mac/freetype2/ftotval.h index 75ba03ee8e..02f65e9199 100755 --- a/freetype2/include/mac/freetype2/ftotval.h +++ b/freetype2/include/mac/freetype2/ftotval.h @@ -30,7 +30,7 @@ #ifndef __FTOTVAL_H__ #define __FTOTVAL_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftoutln.h b/freetype2/include/mac/freetype2/ftoutln.h index d3b8fbd265..b9f2c87ff1 100755 --- a/freetype2/include/mac/freetype2/ftoutln.h +++ b/freetype2/include/mac/freetype2/ftoutln.h @@ -21,7 +21,7 @@ #define __FTOUTLN_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftpfr.h b/freetype2/include/mac/freetype2/ftpfr.h index 7d5035396b..bb1ea1ac5e 100755 --- a/freetype2/include/mac/freetype2/ftpfr.h +++ b/freetype2/include/mac/freetype2/ftpfr.h @@ -19,7 +19,7 @@ #ifndef __FTPFR_H__ #define __FTPFR_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftrender.h b/freetype2/include/mac/freetype2/ftrender.h index e8d36363ca..44e4475271 100755 --- a/freetype2/include/mac/freetype2/ftrender.h +++ b/freetype2/include/mac/freetype2/ftrender.h @@ -20,7 +20,7 @@ #define __FTRENDER_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_MODULE_H #include FT_GLYPH_H diff --git a/freetype2/include/mac/freetype2/ftsizes.h b/freetype2/include/mac/freetype2/ftsizes.h index 4167045701..90ab4930af 100755 --- a/freetype2/include/mac/freetype2/ftsizes.h +++ b/freetype2/include/mac/freetype2/ftsizes.h @@ -29,7 +29,7 @@ #define __FTSIZES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftsnames.h b/freetype2/include/mac/freetype2/ftsnames.h index 88af440356..909dcb4d56 100755 --- a/freetype2/include/mac/freetype2/ftsnames.h +++ b/freetype2/include/mac/freetype2/ftsnames.h @@ -23,7 +23,7 @@ #define __FT_SFNT_NAMES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftstroke.h b/freetype2/include/mac/freetype2/ftstroke.h index bd311709f3..5f95001552 100755 --- a/freetype2/include/mac/freetype2/ftstroke.h +++ b/freetype2/include/mac/freetype2/ftstroke.h @@ -19,7 +19,7 @@ #ifndef __FT_STROKE_H__ #define __FT_STROKE_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_OUTLINE_H #include FT_GLYPH_H diff --git a/freetype2/include/mac/freetype2/ftsynth.h b/freetype2/include/mac/freetype2/ftsynth.h index d0ea730874..1fcfce45dc 100755 --- a/freetype2/include/mac/freetype2/ftsynth.h +++ b/freetype2/include/mac/freetype2/ftsynth.h @@ -45,7 +45,7 @@ #define __FTSYNTH_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftsystem.h b/freetype2/include/mac/freetype2/ftsystem.h index 7436ed2678..afebcbb8f0 100755 --- a/freetype2/include/mac/freetype2/ftsystem.h +++ b/freetype2/include/mac/freetype2/ftsystem.h @@ -20,7 +20,7 @@ #define __FTSYSTEM_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/mac/freetype2/ftttdrv.h b/freetype2/include/mac/freetype2/ftttdrv.h index 358841397c..68e22677e7 100755 --- a/freetype2/include/mac/freetype2/ftttdrv.h +++ b/freetype2/include/mac/freetype2/ftttdrv.h @@ -20,7 +20,7 @@ #ifndef __FTTTDRV_H__ #define __FTTTDRV_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/fttypes.h b/freetype2/include/mac/freetype2/fttypes.h index 2c01e8737c..337e1261c4 100755 --- a/freetype2/include/mac/freetype2/fttypes.h +++ b/freetype2/include/mac/freetype2/fttypes.h @@ -20,7 +20,7 @@ #define __FTTYPES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_CONFIG_CONFIG_H #include FT_SYSTEM_H #include FT_IMAGE_H diff --git a/freetype2/include/mac/freetype2/ftwinfnt.h b/freetype2/include/mac/freetype2/ftwinfnt.h index 50261581a2..b3a6d36fc2 100755 --- a/freetype2/include/mac/freetype2/ftwinfnt.h +++ b/freetype2/include/mac/freetype2/ftwinfnt.h @@ -19,7 +19,7 @@ #ifndef __FTWINFNT_H__ #define __FTWINFNT_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ftxf86.h b/freetype2/include/mac/freetype2/ftxf86.h index 89d1993e1e..e9f1caf0b2 100755 --- a/freetype2/include/mac/freetype2/ftxf86.h +++ b/freetype2/include/mac/freetype2/ftxf86.h @@ -19,7 +19,7 @@ #ifndef __FTXF86_H__ #define __FTXF86_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/t1tables.h b/freetype2/include/mac/freetype2/t1tables.h index 61aefdd541..51d7a2e281 100755 --- a/freetype2/include/mac/freetype2/t1tables.h +++ b/freetype2/include/mac/freetype2/t1tables.h @@ -21,7 +21,7 @@ #define __T1TABLES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ttnameid.h b/freetype2/include/mac/freetype2/ttnameid.h index e65b558127..d680e8ba9a 100755 --- a/freetype2/include/mac/freetype2/ttnameid.h +++ b/freetype2/include/mac/freetype2/ttnameid.h @@ -20,7 +20,7 @@ #define __TTNAMEID_H__ -#include <ft2build.h> +#include "ft2build.h" FT_BEGIN_HEADER diff --git a/freetype2/include/mac/freetype2/tttables.h b/freetype2/include/mac/freetype2/tttables.h index e1d8b05e79..cf074ef8df 100755 --- a/freetype2/include/mac/freetype2/tttables.h +++ b/freetype2/include/mac/freetype2/tttables.h @@ -21,7 +21,7 @@ #define __TTTABLES_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/tttags.h b/freetype2/include/mac/freetype2/tttags.h index d59aa19a33..089ff40d96 100755 --- a/freetype2/include/mac/freetype2/tttags.h +++ b/freetype2/include/mac/freetype2/tttags.h @@ -20,7 +20,7 @@ #define __TTAGS_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/freetype2/include/mac/freetype2/ttunpat.h b/freetype2/include/mac/freetype2/ttunpat.h index bf53ddd528..4390aa7ee4 100755 --- a/freetype2/include/mac/freetype2/ttunpat.h +++ b/freetype2/include/mac/freetype2/ttunpat.h @@ -22,7 +22,7 @@ #define __TTUNPAT_H__ -#include <ft2build.h> +#include "ft2build.h" #include FT_FREETYPE_H #ifdef FREETYPE_H diff --git a/openssl/include/android/openssl/crypto.h b/openssl/include/android/openssl/crypto.h index bd0b140827..d0201671b9 100644 --- a/openssl/include/android/openssl/crypto.h +++ b/openssl/include/android/openssl/crypto.h @@ -25,24 +25,24 @@ # include <stdio.h> # endif -# include <openssl/stack.h> -# include <openssl/safestack.h> -# include <openssl/opensslv.h> -# include <openssl/ossl_typ.h> -# include <openssl/opensslconf.h> +# include "openssl/stack.h" +# include "openssl/safestack.h" +# include "openssl/opensslv.h" +# include "openssl/ossl_typ.h" +# include "openssl/opensslconf.h" # ifdef CHARSET_EBCDIC -# include <openssl/ebcdic.h> +# include "openssl/ebcdic.h" # endif /* * Resolve problems on some operating systems with symbol names that clash * one way or another */ -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/opensslv.h> +# include "openssl/opensslv.h" # endif #ifdef __cplusplus diff --git a/openssl/include/ios/openssl/aes.h b/openssl/include/ios/openssl/aes.h index 245c552abd..4ceba7bbea 100644 --- a/openssl/include/ios/openssl/aes.h +++ b/openssl/include/ios/openssl/aes.h @@ -10,7 +10,7 @@ #ifndef HEADER_AES_H # define HEADER_AES_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # include <stddef.h> # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/asn1.h b/openssl/include/ios/openssl/asn1.h index 7cf6116120..fe7cfc921f 100644 --- a/openssl/include/ios/openssl/asn1.h +++ b/openssl/include/ios/openssl/asn1.h @@ -11,17 +11,17 @@ # define HEADER_ASN1_H # include <time.h> -# include <openssl/e_os2.h> -# include <openssl/opensslconf.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/safestack.h> +# include "openssl/e_os2.h" +# include "openssl/opensslconf.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/safestack.h" -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" -# include <openssl/ossl_typ.h> +# include "openssl/ossl_typ.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef OPENSSL_BUILD_SHLIBCRYPTO diff --git a/openssl/include/ios/openssl/asn1t.h b/openssl/include/ios/openssl/asn1t.h index 8eedfb3f43..73a152d96a 100644 --- a/openssl/include/ios/openssl/asn1t.h +++ b/openssl/include/ios/openssl/asn1t.h @@ -11,8 +11,8 @@ # define HEADER_ASN1T_H # include <stddef.h> -# include <openssl/e_os2.h> -# include <openssl/asn1.h> +# include "openssl/e_os2.h" +# include "openssl/asn1.h" # ifdef OPENSSL_BUILD_SHLIBCRYPTO # undef OPENSSL_EXTERN diff --git a/openssl/include/ios/openssl/bio.h b/openssl/include/ios/openssl/bio.h index 9bc941b25f..3a0b4e236b 100644 --- a/openssl/include/ios/openssl/bio.h +++ b/openssl/include/ios/openssl/bio.h @@ -10,14 +10,14 @@ #ifndef HEADER_BIO_H # define HEADER_BIO_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # endif # include <stdarg.h> -# include <openssl/crypto.h> +# include "openssl/crypto.h" # ifndef OPENSSL_NO_SCTP # ifndef OPENSSL_SYS_VMS diff --git a/openssl/include/ios/openssl/blowfish.h b/openssl/include/ios/openssl/blowfish.h index cd3e460e98..e40ac3a1e5 100644 --- a/openssl/include/ios/openssl/blowfish.h +++ b/openssl/include/ios/openssl/blowfish.h @@ -10,10 +10,10 @@ #ifndef HEADER_BLOWFISH_H # define HEADER_BLOWFISH_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_BF -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/ios/openssl/bn.h b/openssl/include/ios/openssl/bn.h index 17bd52136c..927bac7a27 100644 --- a/openssl/include/ios/openssl/bn.h +++ b/openssl/include/ios/openssl/bn.h @@ -24,13 +24,13 @@ #ifndef HEADER_BN_H # define HEADER_BN_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # endif -# include <openssl/opensslconf.h> -# include <openssl/ossl_typ.h> -# include <openssl/crypto.h> +# include "openssl/opensslconf.h" +# include "openssl/ossl_typ.h" +# include "openssl/crypto.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/buffer.h b/openssl/include/ios/openssl/buffer.h index 91f0e07ff9..ebd67254c4 100644 --- a/openssl/include/ios/openssl/buffer.h +++ b/openssl/include/ios/openssl/buffer.h @@ -10,9 +10,9 @@ #ifndef HEADER_BUFFER_H # define HEADER_BUFFER_H -# include <openssl/ossl_typ.h> +# include "openssl/ossl_typ.h" # ifndef HEADER_CRYPTO_H -# include <openssl/crypto.h> +# include "openssl/crypto.h" # endif diff --git a/openssl/include/ios/openssl/camellia.h b/openssl/include/ios/openssl/camellia.h index 151f3c1349..77ce6913ab 100644 --- a/openssl/include/ios/openssl/camellia.h +++ b/openssl/include/ios/openssl/camellia.h @@ -10,7 +10,7 @@ #ifndef HEADER_CAMELLIA_H # define HEADER_CAMELLIA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CAMELLIA # include <stddef.h> diff --git a/openssl/include/ios/openssl/cast.h b/openssl/include/ios/openssl/cast.h index 2cc89ae013..a247de33a3 100644 --- a/openssl/include/ios/openssl/cast.h +++ b/openssl/include/ios/openssl/cast.h @@ -10,7 +10,7 @@ #ifndef HEADER_CAST_H # define HEADER_CAST_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CAST # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/cmac.h b/openssl/include/ios/openssl/cmac.h index 3535a9abf7..3957b0e2ab 100644 --- a/openssl/include/ios/openssl/cmac.h +++ b/openssl/include/ios/openssl/cmac.h @@ -16,7 +16,7 @@ extern "C" { #endif -# include <openssl/evp.h> +# include "openssl/evp.h" /* Opaque */ typedef struct CMAC_CTX_st CMAC_CTX; diff --git a/openssl/include/ios/openssl/cms.h b/openssl/include/ios/openssl/cms.h index 7e534e0dd6..069fb2df4d 100644 --- a/openssl/include/ios/openssl/cms.h +++ b/openssl/include/ios/openssl/cms.h @@ -10,11 +10,11 @@ #ifndef HEADER_CMS_H # define HEADER_CMS_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CMS -# include <openssl/x509.h> -# include <openssl/x509v3.h> +# include "openssl/x509.h" +# include "openssl/x509v3.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/ios/openssl/comp.h b/openssl/include/ios/openssl/comp.h index 260ff1e0ac..949ee77c00 100644 --- a/openssl/include/ios/openssl/comp.h +++ b/openssl/include/ios/openssl/comp.h @@ -10,10 +10,10 @@ #ifndef HEADER_COMP_H # define HEADER_COMP_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_COMP -# include <openssl/crypto.h> +# include "openssl/crypto.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/ios/openssl/conf.h b/openssl/include/ios/openssl/conf.h index 462e3c9d39..17503e81b8 100644 --- a/openssl/include/ios/openssl/conf.h +++ b/openssl/include/ios/openssl/conf.h @@ -10,13 +10,13 @@ #ifndef HEADER_CONF_H # define HEADER_CONF_H -# include <openssl/bio.h> -# include <openssl/lhash.h> -# include <openssl/stack.h> -# include <openssl/safestack.h> -# include <openssl/e_os2.h> +# include "openssl/bio.h" +# include "openssl/lhash.h" +# include "openssl/stack.h" +# include "openssl/safestack.h" +# include "openssl/e_os2.h" -# include <openssl/ossl_typ.h> +# include "openssl/ossl_typ.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/conf_api.h b/openssl/include/ios/openssl/conf_api.h index a0275ad79b..e3664fe428 100644 --- a/openssl/include/ios/openssl/conf_api.h +++ b/openssl/include/ios/openssl/conf_api.h @@ -10,8 +10,8 @@ #ifndef HEADER_CONF_API_H # define HEADER_CONF_API_H -# include <openssl/lhash.h> -# include <openssl/conf.h> +# include "openssl/lhash.h" +# include "openssl/conf.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/crypto.h b/openssl/include/ios/openssl/crypto.h index bd0b140827..c1a9df302b 100644 --- a/openssl/include/ios/openssl/crypto.h +++ b/openssl/include/ios/openssl/crypto.h @@ -19,30 +19,30 @@ # include <stdlib.h> # include <time.h> -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # endif -# include <openssl/stack.h> -# include <openssl/safestack.h> -# include <openssl/opensslv.h> -# include <openssl/ossl_typ.h> -# include <openssl/opensslconf.h> +# include "openssl/stack.h" +# include "openssl/safestack.h" +# include "openssl/opensslv.h" +# include "openssl/ossl_typ.h" +# include "openssl/opensslconf.h" # ifdef CHARSET_EBCDIC -# include <openssl/ebcdic.h> +# include "openssl/ebcdic.h" # endif /* * Resolve problems on some operating systems with symbol names that clash * one way or another */ -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/opensslv.h> +# include "openssl/opensslv.h" # endif #ifdef __cplusplus diff --git a/openssl/include/ios/openssl/ct.h b/openssl/include/ios/openssl/ct.h index 6c63265257..c589c3cb75 100644 --- a/openssl/include/ios/openssl/ct.h +++ b/openssl/include/ios/openssl/ct.h @@ -10,12 +10,12 @@ #ifndef HEADER_CT_H # define HEADER_CT_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CT -# include <openssl/ossl_typ.h> -# include <openssl/safestack.h> -# include <openssl/x509.h> +# include "openssl/ossl_typ.h" +# include "openssl/safestack.h" +# include "openssl/x509.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/ios/openssl/des.h b/openssl/include/ios/openssl/des.h index be4abbdfd0..0dca422cdd 100644 --- a/openssl/include/ios/openssl/des.h +++ b/openssl/include/ios/openssl/des.h @@ -10,7 +10,7 @@ #ifndef HEADER_DES_H # define HEADER_DES_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_DES # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/dh.h b/openssl/include/ios/openssl/dh.h index ae309e7b31..51ff7ac05a 100644 --- a/openssl/include/ios/openssl/dh.h +++ b/openssl/include/ios/openssl/dh.h @@ -10,15 +10,15 @@ #ifndef HEADER_DH_H # define HEADER_DH_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_DH -# include <openssl/e_os2.h> -# include <openssl/bio.h> -# include <openssl/asn1.h> -# include <openssl/ossl_typ.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" +# include "openssl/asn1.h" +# include "openssl/ossl_typ.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/dsa.h b/openssl/include/ios/openssl/dsa.h index cb5fbc2f05..e249b3e7ae 100644 --- a/openssl/include/ios/openssl/dsa.h +++ b/openssl/include/ios/openssl/dsa.h @@ -15,20 +15,20 @@ #ifndef HEADER_DSA_H # define HEADER_DSA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_DSA # ifdef __cplusplus extern "C" { # endif -# include <openssl/e_os2.h> -# include <openssl/bio.h> -# include <openssl/crypto.h> -# include <openssl/ossl_typ.h> -# include <openssl/opensslconf.h> -# include <openssl/bn.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" +# include "openssl/crypto.h" +# include "openssl/ossl_typ.h" +# include "openssl/opensslconf.h" +# include "openssl/bn.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/dh.h> +# include "openssl/dh.h" # endif # ifndef OPENSSL_DSA_MAX_MODULUS_BITS diff --git a/openssl/include/ios/openssl/e_os2.h b/openssl/include/ios/openssl/e_os2.h index 99ea3477d7..7f57e6b826 100644 --- a/openssl/include/ios/openssl/e_os2.h +++ b/openssl/include/ios/openssl/e_os2.h @@ -10,7 +10,7 @@ #ifndef HEADER_E_OS2_H # define HEADER_E_OS2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/ec.h b/openssl/include/ios/openssl/ec.h index 656cb410e6..6b2cd5a6ef 100644 --- a/openssl/include/ios/openssl/ec.h +++ b/openssl/include/ios/openssl/ec.h @@ -24,13 +24,13 @@ #ifndef HEADER_EC_H # define HEADER_EC_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_EC -# include <openssl/asn1.h> -# include <openssl/symhacks.h> +# include "openssl/asn1.h" +# include "openssl/symhacks.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/ecdh.h b/openssl/include/ios/openssl/ecdh.h index 681f3d5e55..6481126caa 100644 --- a/openssl/include/ios/openssl/ecdh.h +++ b/openssl/include/ios/openssl/ecdh.h @@ -7,4 +7,4 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/ec.h> +#include "openssl/ec.h" diff --git a/openssl/include/ios/openssl/ecdsa.h b/openssl/include/ios/openssl/ecdsa.h index 681f3d5e55..6481126caa 100644 --- a/openssl/include/ios/openssl/ecdsa.h +++ b/openssl/include/ios/openssl/ecdsa.h @@ -7,4 +7,4 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/ec.h> +#include "openssl/ec.h" diff --git a/openssl/include/ios/openssl/engine.h b/openssl/include/ios/openssl/engine.h index 319371e425..113963b527 100644 --- a/openssl/include/ios/openssl/engine.h +++ b/openssl/include/ios/openssl/engine.h @@ -16,22 +16,22 @@ #ifndef HEADER_ENGINE_H # define HEADER_ENGINE_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_ENGINE # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> -# include <openssl/rsa.h> -# include <openssl/dsa.h> -# include <openssl/dh.h> -# include <openssl/ec.h> -# include <openssl/rand.h> -# include <openssl/ui.h> -# include <openssl/err.h> +# include "openssl/bn.h" +# include "openssl/rsa.h" +# include "openssl/dsa.h" +# include "openssl/dh.h" +# include "openssl/ec.h" +# include "openssl/rand.h" +# include "openssl/ui.h" +# include "openssl/err.h" # endif -# include <openssl/ossl_typ.h> -# include <openssl/symhacks.h> -# include <openssl/x509.h> +# include "openssl/ossl_typ.h" +# include "openssl/symhacks.h" +# include "openssl/x509.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/ios/openssl/err.h b/openssl/include/ios/openssl/err.h index f9390919ab..15931d0936 100644 --- a/openssl/include/ios/openssl/err.h +++ b/openssl/include/ios/openssl/err.h @@ -10,16 +10,16 @@ #ifndef HEADER_ERR_H # define HEADER_ERR_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # include <stdlib.h> # endif -# include <openssl/ossl_typ.h> -# include <openssl/bio.h> -# include <openssl/lhash.h> +# include "openssl/ossl_typ.h" +# include "openssl/bio.h" +# include "openssl/lhash.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/evp.h b/openssl/include/ios/openssl/evp.h index b9c83b2b52..1a375b7035 100644 --- a/openssl/include/ios/openssl/evp.h +++ b/openssl/include/ios/openssl/evp.h @@ -10,10 +10,10 @@ #ifndef HEADER_ENVELOPE_H # define HEADER_ENVELOPE_H -# include <openssl/opensslconf.h> -# include <openssl/ossl_typ.h> -# include <openssl/symhacks.h> -# include <openssl/bio.h> +# include "openssl/opensslconf.h" +# include "openssl/ossl_typ.h" +# include "openssl/symhacks.h" +# include "openssl/bio.h" # define EVP_MAX_MD_SIZE 64/* longest known is SHA512 */ # define EVP_MAX_KEY_LENGTH 64 @@ -24,7 +24,7 @@ /* Default PKCS#5 iteration count */ # define PKCS5_DEFAULT_ITER 2048 -# include <openssl/objects.h> +# include "openssl/objects.h" # define EVP_PK_RSA 0x0001 # define EVP_PK_DSA 0x0002 diff --git a/openssl/include/ios/openssl/hmac.h b/openssl/include/ios/openssl/hmac.h index 9f06896059..9cc2fef4a3 100644 --- a/openssl/include/ios/openssl/hmac.h +++ b/openssl/include/ios/openssl/hmac.h @@ -10,9 +10,9 @@ #ifndef HEADER_HMAC_H # define HEADER_HMAC_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" -# include <openssl/evp.h> +# include "openssl/evp.h" # define HMAC_MAX_MD_CBLOCK 128/* largest known is SHA512 */ diff --git a/openssl/include/ios/openssl/idea.h b/openssl/include/ios/openssl/idea.h index 4334f3ea71..03a4604d20 100644 --- a/openssl/include/ios/openssl/idea.h +++ b/openssl/include/ios/openssl/idea.h @@ -10,7 +10,7 @@ #ifndef HEADER_IDEA_H # define HEADER_IDEA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_IDEA # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/lhash.h b/openssl/include/ios/openssl/lhash.h index e2ccb65d69..0bdacbda63 100644 --- a/openssl/include/ios/openssl/lhash.h +++ b/openssl/include/ios/openssl/lhash.h @@ -14,8 +14,8 @@ #ifndef HEADER_LHASH_H # define HEADER_LHASH_H -# include <openssl/e_os2.h> -# include <openssl/bio.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/md2.h b/openssl/include/ios/openssl/md2.h index 7faf8e3d65..5738c608e9 100644 --- a/openssl/include/ios/openssl/md2.h +++ b/openssl/include/ios/openssl/md2.h @@ -10,7 +10,7 @@ #ifndef HEADER_MD2_H # define HEADER_MD2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_MD2 # include <stddef.h> diff --git a/openssl/include/ios/openssl/md4.h b/openssl/include/ios/openssl/md4.h index 940e29db40..2421997eb9 100644 --- a/openssl/include/ios/openssl/md4.h +++ b/openssl/include/ios/openssl/md4.h @@ -10,10 +10,10 @@ #ifndef HEADER_MD4_H # define HEADER_MD4_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_MD4 -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/md5.h b/openssl/include/ios/openssl/md5.h index 2deb772118..2d90a26c2a 100644 --- a/openssl/include/ios/openssl/md5.h +++ b/openssl/include/ios/openssl/md5.h @@ -10,10 +10,10 @@ #ifndef HEADER_MD5_H # define HEADER_MD5_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_MD5 -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/mdc2.h b/openssl/include/ios/openssl/mdc2.h index aabd2bfaad..37ac79a6b8 100644 --- a/openssl/include/ios/openssl/mdc2.h +++ b/openssl/include/ios/openssl/mdc2.h @@ -10,11 +10,11 @@ #ifndef HEADER_MDC2_H # define HEADER_MDC2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" #ifndef OPENSSL_NO_MDC2 # include <stdlib.h> -# include <openssl/des.h> +# include "openssl/des.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/ios/openssl/objects.h b/openssl/include/ios/openssl/objects.h index 09d614ffc0..5fc519ab52 100644 --- a/openssl/include/ios/openssl/objects.h +++ b/openssl/include/ios/openssl/objects.h @@ -13,7 +13,7 @@ # define USE_OBJ_MAC # ifdef USE_OBJ_MAC -# include <openssl/obj_mac.h> +# include "openssl/obj_mac.h" # else # define SN_undef "UNDEF" # define LN_undef "undefined" @@ -912,8 +912,8 @@ # define OBJ_OCSP_sign OBJ_id_kp,9L # endif /* USE_OBJ_MAC */ -# include <openssl/bio.h> -# include <openssl/asn1.h> +# include "openssl/bio.h" +# include "openssl/asn1.h" # define OBJ_NAME_TYPE_UNDEF 0x00 # define OBJ_NAME_TYPE_MD_METH 0x01 diff --git a/openssl/include/ios/openssl/ocsp.h b/openssl/include/ios/openssl/ocsp.h index 08debc5b78..c09e43078e 100644 --- a/openssl/include/ios/openssl/ocsp.h +++ b/openssl/include/ios/openssl/ocsp.h @@ -10,7 +10,7 @@ #ifndef HEADER_OCSP_H # define HEADER_OCSP_H -#include <openssl/opensslconf.h> +#include "openssl/opensslconf.h" /* * These definitions are outside the OPENSSL_NO_OCSP guard because although for @@ -41,10 +41,10 @@ # ifndef OPENSSL_NO_OCSP -# include <openssl/ossl_typ.h> -# include <openssl/x509.h> -# include <openssl/x509v3.h> -# include <openssl/safestack.h> +# include "openssl/ossl_typ.h" +# include "openssl/x509.h" +# include "openssl/x509v3.h" +# include "openssl/safestack.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/ossl_typ.h b/openssl/include/ios/openssl/ossl_typ.h index 129a67f057..23641a6bc3 100644 --- a/openssl/include/ios/openssl/ossl_typ.h +++ b/openssl/include/ios/openssl/ossl_typ.h @@ -16,7 +16,7 @@ extern "C" { #endif -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifdef NO_ASN1_TYPEDEFS # define ASN1_INTEGER ASN1_STRING diff --git a/openssl/include/ios/openssl/pem.h b/openssl/include/ios/openssl/pem.h index 2375d63553..42184ab73f 100644 --- a/openssl/include/ios/openssl/pem.h +++ b/openssl/include/ios/openssl/pem.h @@ -10,12 +10,12 @@ #ifndef HEADER_PEM_H # define HEADER_PEM_H -# include <openssl/e_os2.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/evp.h> -# include <openssl/x509.h> -# include <openssl/pem2.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/evp.h" +# include "openssl/x509.h" +# include "openssl/pem2.h" #ifdef __cplusplus extern "C" { @@ -326,7 +326,7 @@ int PEM_def_callback(char *buf, int num, int w, void *key); void PEM_proc_type(char *buf, int type); void PEM_dek_info(char *buf, const char *type, int len, char *str); -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" DECLARE_PEM_rw(X509, X509) DECLARE_PEM_rw(X509_AUX, X509) diff --git a/openssl/include/ios/openssl/pkcs12.h b/openssl/include/ios/openssl/pkcs12.h index deaded9df9..c17936fcf9 100644 --- a/openssl/include/ios/openssl/pkcs12.h +++ b/openssl/include/ios/openssl/pkcs12.h @@ -10,8 +10,8 @@ #ifndef HEADER_PKCS12_H # define HEADER_PKCS12_H -# include <openssl/bio.h> -# include <openssl/x509.h> +# include "openssl/bio.h" +# include "openssl/x509.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/pkcs7.h b/openssl/include/ios/openssl/pkcs7.h index 691f722022..7e9ebcd38f 100644 --- a/openssl/include/ios/openssl/pkcs7.h +++ b/openssl/include/ios/openssl/pkcs7.h @@ -10,12 +10,12 @@ #ifndef HEADER_PKCS7_H # define HEADER_PKCS7_H -# include <openssl/asn1.h> -# include <openssl/bio.h> -# include <openssl/e_os2.h> +# include "openssl/asn1.h" +# include "openssl/bio.h" +# include "openssl/e_os2.h" -# include <openssl/symhacks.h> -# include <openssl/ossl_typ.h> +# include "openssl/symhacks.h" +# include "openssl/ossl_typ.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/rand.h b/openssl/include/ios/openssl/rand.h index d521ae192a..e3ecb1a32f 100644 --- a/openssl/include/ios/openssl/rand.h +++ b/openssl/include/ios/openssl/rand.h @@ -11,8 +11,8 @@ # define HEADER_RAND_H # include <stdlib.h> -# include <openssl/ossl_typ.h> -# include <openssl/e_os2.h> +# include "openssl/ossl_typ.h" +# include "openssl/e_os2.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/rc2.h b/openssl/include/ios/openssl/rc2.h index 585f9e4c38..40e8ab2e43 100644 --- a/openssl/include/ios/openssl/rc2.h +++ b/openssl/include/ios/openssl/rc2.h @@ -10,7 +10,7 @@ #ifndef HEADER_RC2_H # define HEADER_RC2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RC2 # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/rc4.h b/openssl/include/ios/openssl/rc4.h index 86803b37fb..1755e7e749 100644 --- a/openssl/include/ios/openssl/rc4.h +++ b/openssl/include/ios/openssl/rc4.h @@ -10,7 +10,7 @@ #ifndef HEADER_RC4_H # define HEADER_RC4_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RC4 # include <stddef.h> diff --git a/openssl/include/ios/openssl/rc5.h b/openssl/include/ios/openssl/rc5.h index 793f88e4e8..997f152f90 100644 --- a/openssl/include/ios/openssl/rc5.h +++ b/openssl/include/ios/openssl/rc5.h @@ -10,7 +10,7 @@ #ifndef HEADER_RC5_H # define HEADER_RC5_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RC5 # ifdef __cplusplus diff --git a/openssl/include/ios/openssl/ripemd.h b/openssl/include/ios/openssl/ripemd.h index c42026aa42..1fe7399a93 100644 --- a/openssl/include/ios/openssl/ripemd.h +++ b/openssl/include/ios/openssl/ripemd.h @@ -10,10 +10,10 @@ #ifndef HEADER_RIPEMD_H # define HEADER_RIPEMD_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" #ifndef OPENSSL_NO_RMD160 -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/rsa.h b/openssl/include/ios/openssl/rsa.h index 4d6e9cc9a9..96eccf749e 100644 --- a/openssl/include/ios/openssl/rsa.h +++ b/openssl/include/ios/openssl/rsa.h @@ -10,15 +10,15 @@ #ifndef HEADER_RSA_H # define HEADER_RSA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RSA -# include <openssl/asn1.h> -# include <openssl/bio.h> -# include <openssl/crypto.h> -# include <openssl/ossl_typ.h> +# include "openssl/asn1.h" +# include "openssl/bio.h" +# include "openssl/crypto.h" +# include "openssl/ossl_typ.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/safestack.h b/openssl/include/ios/openssl/safestack.h index 9fe733c24e..34874f7b93 100644 --- a/openssl/include/ios/openssl/safestack.h +++ b/openssl/include/ios/openssl/safestack.h @@ -10,8 +10,8 @@ #ifndef HEADER_SAFESTACK_H # define HEADER_SAFESTACK_H -# include <openssl/stack.h> -# include <openssl/e_os2.h> +# include "openssl/stack.h" +# include "openssl/e_os2.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/seed.h b/openssl/include/ios/openssl/seed.h index bb97131d76..010124143e 100644 --- a/openssl/include/ios/openssl/seed.h +++ b/openssl/include/ios/openssl/seed.h @@ -35,11 +35,11 @@ #ifndef HEADER_SEED_H # define HEADER_SEED_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_SEED -# include <openssl/e_os2.h> -# include <openssl/crypto.h> +# include "openssl/e_os2.h" +# include "openssl/crypto.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/sha.h b/openssl/include/ios/openssl/sha.h index 6a1eb0de8b..7ea1722eea 100644 --- a/openssl/include/ios/openssl/sha.h +++ b/openssl/include/ios/openssl/sha.h @@ -10,7 +10,7 @@ #ifndef HEADER_SHA_H # define HEADER_SHA_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> #ifdef __cplusplus diff --git a/openssl/include/ios/openssl/srp.h b/openssl/include/ios/openssl/srp.h index f2b6ec750d..e17c753203 100644 --- a/openssl/include/ios/openssl/srp.h +++ b/openssl/include/ios/openssl/srp.h @@ -10,14 +10,14 @@ #ifndef HEADER_SRP_H # define HEADER_SRP_H -#include <openssl/opensslconf.h> +#include "openssl/opensslconf.h" #ifndef OPENSSL_NO_SRP # include <stdio.h> # include <string.h> -# include <openssl/safestack.h> -# include <openssl/bn.h> -# include <openssl/crypto.h> +# include "openssl/safestack.h" +# include "openssl/bn.h" +# include "openssl/crypto.h" # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/srtp.h b/openssl/include/ios/openssl/srtp.h index 5ddfa46d9b..6bc4a6d2a3 100644 --- a/openssl/include/ios/openssl/srtp.h +++ b/openssl/include/ios/openssl/srtp.h @@ -16,7 +16,7 @@ #ifndef HEADER_D1_SRTP_H # define HEADER_D1_SRTP_H -# include <openssl/ssl.h> +# include "openssl/ssl.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/ssl.h b/openssl/include/ios/openssl/ssl.h index 86ab9125de..cc520052b0 100644 --- a/openssl/include/ios/openssl/ssl.h +++ b/openssl/include/ios/openssl/ssl.h @@ -42,23 +42,23 @@ #ifndef HEADER_SSL_H # define HEADER_SSL_H -# include <openssl/e_os2.h> -# include <openssl/opensslconf.h> -# include <openssl/comp.h> -# include <openssl/bio.h> +# include "openssl/e_os2.h" +# include "openssl/opensslconf.h" +# include "openssl/comp.h" +# include "openssl/bio.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/x509.h> -# include <openssl/crypto.h> -# include <openssl/lhash.h> -# include <openssl/buffer.h> +# include "openssl/x509.h" +# include "openssl/crypto.h" +# include "openssl/lhash.h" +# include "openssl/buffer.h" # endif -# include <openssl/pem.h> -# include <openssl/hmac.h> -# include <openssl/async.h> +# include "openssl/pem.h" +# include "openssl/hmac.h" +# include "openssl/async.h" -# include <openssl/safestack.h> -# include <openssl/symhacks.h> -# include <openssl/ct.h> +# include "openssl/safestack.h" +# include "openssl/symhacks.h" +# include "openssl/ct.h" #ifdef __cplusplus extern "C" { @@ -804,11 +804,11 @@ __owur int SSL_extension_supported(unsigned int ext_type); } #endif -# include <openssl/ssl2.h> -# include <openssl/ssl3.h> -# include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */ -# include <openssl/dtls1.h> /* Datagram TLS */ -# include <openssl/srtp.h> /* Support for the use_srtp extension */ +# include "openssl/ssl2.h" +# include "openssl/ssl3.h" +# include "openssl/tls1.h" /* This is mostly sslv3 with a few tweaks */ +# include "openssl/dtls1.h" /* Datagram TLS */ +# include "openssl/srtp.h" /* Support for the use_srtp extension */ #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/ssl3.h b/openssl/include/ios/openssl/ssl3.h index aca1922306..d46c28ff0d 100644 --- a/openssl/include/ios/openssl/ssl3.h +++ b/openssl/include/ios/openssl/ssl3.h @@ -16,10 +16,10 @@ #ifndef HEADER_SSL3_H # define HEADER_SSL3_H -# include <openssl/comp.h> -# include <openssl/buffer.h> -# include <openssl/evp.h> -# include <openssl/ssl.h> +# include "openssl/comp.h" +# include "openssl/buffer.h" +# include "openssl/evp.h" +# include "openssl/ssl.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/symhacks.h b/openssl/include/ios/openssl/symhacks.h index caf1f1a75d..61b4ba478b 100644 --- a/openssl/include/ios/openssl/symhacks.h +++ b/openssl/include/ios/openssl/symhacks.h @@ -10,7 +10,7 @@ #ifndef HEADER_SYMHACKS_H # define HEADER_SYMHACKS_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" /* Case insensitive linking causes problems.... */ # if defined(OPENSSL_SYS_VMS) diff --git a/openssl/include/ios/openssl/tls1.h b/openssl/include/ios/openssl/tls1.h index 23e382cdd3..3173c8be9a 100644 --- a/openssl/include/ios/openssl/tls1.h +++ b/openssl/include/ios/openssl/tls1.h @@ -50,8 +50,8 @@ #ifndef HEADER_TLS1_H # define HEADER_TLS1_H -# include <openssl/buffer.h> -# include <openssl/x509.h> +# include "openssl/buffer.h" +# include "openssl/x509.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/ts.h b/openssl/include/ios/openssl/ts.h index a5659825fb..2ec087f0dc 100644 --- a/openssl/include/ios/openssl/ts.h +++ b/openssl/include/ios/openssl/ts.h @@ -10,25 +10,25 @@ #ifndef HEADER_TS_H # define HEADER_TS_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_TS -# include <openssl/symhacks.h> -# include <openssl/buffer.h> -# include <openssl/evp.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/asn1.h> -# include <openssl/safestack.h> -# include <openssl/rsa.h> -# include <openssl/dsa.h> -# include <openssl/dh.h> +# include "openssl/symhacks.h" +# include "openssl/buffer.h" +# include "openssl/evp.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/asn1.h" +# include "openssl/safestack.h" +# include "openssl/rsa.h" +# include "openssl/dsa.h" +# include "openssl/dh.h" # ifdef __cplusplus extern "C" { # endif -# include <openssl/x509.h> -# include <openssl/x509v3.h> +# include "openssl/x509.h" +# include "openssl/x509v3.h" typedef struct TS_msg_imprint_st TS_MSG_IMPRINT; typedef struct TS_req_st TS_REQ; diff --git a/openssl/include/ios/openssl/txt_db.h b/openssl/include/ios/openssl/txt_db.h index 0e6c943e0e..e94743a756 100644 --- a/openssl/include/ios/openssl/txt_db.h +++ b/openssl/include/ios/openssl/txt_db.h @@ -10,10 +10,10 @@ #ifndef HEADER_TXT_DB_H # define HEADER_TXT_DB_H -# include <openssl/opensslconf.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/lhash.h> +# include "openssl/opensslconf.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/lhash.h" # define DB_ERROR_OK 0 # define DB_ERROR_MALLOC 1 diff --git a/openssl/include/ios/openssl/ui.h b/openssl/include/ios/openssl/ui.h index 26f4f04495..ad97a85c09 100644 --- a/openssl/include/ios/openssl/ui.h +++ b/openssl/include/ios/openssl/ui.h @@ -10,15 +10,15 @@ #ifndef HEADER_UI_H # define HEADER_UI_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_UI # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/crypto.h> +# include "openssl/crypto.h" # endif -# include <openssl/safestack.h> -# include <openssl/ossl_typ.h> +# include "openssl/safestack.h" +# include "openssl/ossl_typ.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/whrlpool.h b/openssl/include/ios/openssl/whrlpool.h index 20ea3503b7..685a90978f 100644 --- a/openssl/include/ios/openssl/whrlpool.h +++ b/openssl/include/ios/openssl/whrlpool.h @@ -10,10 +10,10 @@ #ifndef HEADER_WHRLPOOL_H # define HEADER_WHRLPOOL_H -#include <openssl/opensslconf.h> +#include "openssl/opensslconf.h" # ifndef OPENSSL_NO_WHIRLPOOL -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/x509.h b/openssl/include/ios/openssl/x509.h index c8996f3520..6e69437787 100644 --- a/openssl/include/ios/openssl/x509.h +++ b/openssl/include/ios/openssl/x509.h @@ -16,24 +16,24 @@ #ifndef HEADER_X509_H # define HEADER_X509_H -# include <openssl/e_os2.h> -# include <openssl/ossl_typ.h> -# include <openssl/symhacks.h> -# include <openssl/buffer.h> -# include <openssl/evp.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/asn1.h> -# include <openssl/safestack.h> -# include <openssl/ec.h> +# include "openssl/e_os2.h" +# include "openssl/ossl_typ.h" +# include "openssl/symhacks.h" +# include "openssl/buffer.h" +# include "openssl/evp.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/asn1.h" +# include "openssl/safestack.h" +# include "openssl/ec.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/rsa.h> -# include <openssl/dsa.h> -# include <openssl/dh.h> +# include "openssl/rsa.h" +# include "openssl/dsa.h" +# include "openssl/dh.h" # endif -# include <openssl/sha.h> +# include "openssl/sha.h" #ifdef __cplusplus extern "C" { @@ -306,8 +306,8 @@ typedef struct PBKDF2PARAM_st { } #endif -# include <openssl/x509_vfy.h> -# include <openssl/pkcs7.h> +# include "openssl/x509_vfy.h" +# include "openssl/pkcs7.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/x509_vfy.h b/openssl/include/ios/openssl/x509_vfy.h index cab8005eee..3ea046e342 100644 --- a/openssl/include/ios/openssl/x509_vfy.h +++ b/openssl/include/ios/openssl/x509_vfy.h @@ -14,14 +14,14 @@ * Protect against recursion, x509.h and x509_vfy.h each include the other. */ # ifndef HEADER_X509_H -# include <openssl/x509.h> +# include "openssl/x509.h" # endif -# include <openssl/opensslconf.h> -# include <openssl/lhash.h> -# include <openssl/bio.h> -# include <openssl/crypto.h> -# include <openssl/symhacks.h> +# include "openssl/opensslconf.h" +# include "openssl/lhash.h" +# include "openssl/bio.h" +# include "openssl/crypto.h" +# include "openssl/symhacks.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/ios/openssl/x509v3.h b/openssl/include/ios/openssl/x509v3.h index f21ce7c126..6f35b41255 100644 --- a/openssl/include/ios/openssl/x509v3.h +++ b/openssl/include/ios/openssl/x509v3.h @@ -10,9 +10,9 @@ #ifndef HEADER_X509V3_H # define HEADER_X509V3_H -# include <openssl/bio.h> -# include <openssl/x509.h> -# include <openssl/conf.h> +# include "openssl/bio.h" +# include "openssl/x509.h" +# include "openssl/conf.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/aes.h b/openssl/include/mac/openssl/aes.h index 245c552abd..4ceba7bbea 100644 --- a/openssl/include/mac/openssl/aes.h +++ b/openssl/include/mac/openssl/aes.h @@ -10,7 +10,7 @@ #ifndef HEADER_AES_H # define HEADER_AES_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # include <stddef.h> # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/asn1.h b/openssl/include/mac/openssl/asn1.h index 7cf6116120..fe7cfc921f 100644 --- a/openssl/include/mac/openssl/asn1.h +++ b/openssl/include/mac/openssl/asn1.h @@ -11,17 +11,17 @@ # define HEADER_ASN1_H # include <time.h> -# include <openssl/e_os2.h> -# include <openssl/opensslconf.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/safestack.h> +# include "openssl/e_os2.h" +# include "openssl/opensslconf.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/safestack.h" -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" -# include <openssl/ossl_typ.h> +# include "openssl/ossl_typ.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef OPENSSL_BUILD_SHLIBCRYPTO diff --git a/openssl/include/mac/openssl/asn1t.h b/openssl/include/mac/openssl/asn1t.h index 8eedfb3f43..73a152d96a 100644 --- a/openssl/include/mac/openssl/asn1t.h +++ b/openssl/include/mac/openssl/asn1t.h @@ -11,8 +11,8 @@ # define HEADER_ASN1T_H # include <stddef.h> -# include <openssl/e_os2.h> -# include <openssl/asn1.h> +# include "openssl/e_os2.h" +# include "openssl/asn1.h" # ifdef OPENSSL_BUILD_SHLIBCRYPTO # undef OPENSSL_EXTERN diff --git a/openssl/include/mac/openssl/bio.h b/openssl/include/mac/openssl/bio.h index 9bc941b25f..3a0b4e236b 100644 --- a/openssl/include/mac/openssl/bio.h +++ b/openssl/include/mac/openssl/bio.h @@ -10,14 +10,14 @@ #ifndef HEADER_BIO_H # define HEADER_BIO_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # endif # include <stdarg.h> -# include <openssl/crypto.h> +# include "openssl/crypto.h" # ifndef OPENSSL_NO_SCTP # ifndef OPENSSL_SYS_VMS diff --git a/openssl/include/mac/openssl/blowfish.h b/openssl/include/mac/openssl/blowfish.h index cd3e460e98..e40ac3a1e5 100644 --- a/openssl/include/mac/openssl/blowfish.h +++ b/openssl/include/mac/openssl/blowfish.h @@ -10,10 +10,10 @@ #ifndef HEADER_BLOWFISH_H # define HEADER_BLOWFISH_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_BF -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/mac/openssl/bn.h b/openssl/include/mac/openssl/bn.h index 17bd52136c..927bac7a27 100644 --- a/openssl/include/mac/openssl/bn.h +++ b/openssl/include/mac/openssl/bn.h @@ -24,13 +24,13 @@ #ifndef HEADER_BN_H # define HEADER_BN_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # endif -# include <openssl/opensslconf.h> -# include <openssl/ossl_typ.h> -# include <openssl/crypto.h> +# include "openssl/opensslconf.h" +# include "openssl/ossl_typ.h" +# include "openssl/crypto.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/buffer.h b/openssl/include/mac/openssl/buffer.h index 91f0e07ff9..ebd67254c4 100644 --- a/openssl/include/mac/openssl/buffer.h +++ b/openssl/include/mac/openssl/buffer.h @@ -10,9 +10,9 @@ #ifndef HEADER_BUFFER_H # define HEADER_BUFFER_H -# include <openssl/ossl_typ.h> +# include "openssl/ossl_typ.h" # ifndef HEADER_CRYPTO_H -# include <openssl/crypto.h> +# include "openssl/crypto.h" # endif diff --git a/openssl/include/mac/openssl/camellia.h b/openssl/include/mac/openssl/camellia.h index 151f3c1349..77ce6913ab 100644 --- a/openssl/include/mac/openssl/camellia.h +++ b/openssl/include/mac/openssl/camellia.h @@ -10,7 +10,7 @@ #ifndef HEADER_CAMELLIA_H # define HEADER_CAMELLIA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CAMELLIA # include <stddef.h> diff --git a/openssl/include/mac/openssl/cast.h b/openssl/include/mac/openssl/cast.h index 2cc89ae013..a247de33a3 100644 --- a/openssl/include/mac/openssl/cast.h +++ b/openssl/include/mac/openssl/cast.h @@ -10,7 +10,7 @@ #ifndef HEADER_CAST_H # define HEADER_CAST_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CAST # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/cmac.h b/openssl/include/mac/openssl/cmac.h index 3535a9abf7..3957b0e2ab 100644 --- a/openssl/include/mac/openssl/cmac.h +++ b/openssl/include/mac/openssl/cmac.h @@ -16,7 +16,7 @@ extern "C" { #endif -# include <openssl/evp.h> +# include "openssl/evp.h" /* Opaque */ typedef struct CMAC_CTX_st CMAC_CTX; diff --git a/openssl/include/mac/openssl/cms.h b/openssl/include/mac/openssl/cms.h index 7e534e0dd6..069fb2df4d 100644 --- a/openssl/include/mac/openssl/cms.h +++ b/openssl/include/mac/openssl/cms.h @@ -10,11 +10,11 @@ #ifndef HEADER_CMS_H # define HEADER_CMS_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CMS -# include <openssl/x509.h> -# include <openssl/x509v3.h> +# include "openssl/x509.h" +# include "openssl/x509v3.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/mac/openssl/comp.h b/openssl/include/mac/openssl/comp.h index 260ff1e0ac..949ee77c00 100644 --- a/openssl/include/mac/openssl/comp.h +++ b/openssl/include/mac/openssl/comp.h @@ -10,10 +10,10 @@ #ifndef HEADER_COMP_H # define HEADER_COMP_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_COMP -# include <openssl/crypto.h> +# include "openssl/crypto.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/mac/openssl/conf.h b/openssl/include/mac/openssl/conf.h index 462e3c9d39..17503e81b8 100644 --- a/openssl/include/mac/openssl/conf.h +++ b/openssl/include/mac/openssl/conf.h @@ -10,13 +10,13 @@ #ifndef HEADER_CONF_H # define HEADER_CONF_H -# include <openssl/bio.h> -# include <openssl/lhash.h> -# include <openssl/stack.h> -# include <openssl/safestack.h> -# include <openssl/e_os2.h> +# include "openssl/bio.h" +# include "openssl/lhash.h" +# include "openssl/stack.h" +# include "openssl/safestack.h" +# include "openssl/e_os2.h" -# include <openssl/ossl_typ.h> +# include "openssl/ossl_typ.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/conf_api.h b/openssl/include/mac/openssl/conf_api.h index a0275ad79b..e3664fe428 100644 --- a/openssl/include/mac/openssl/conf_api.h +++ b/openssl/include/mac/openssl/conf_api.h @@ -10,8 +10,8 @@ #ifndef HEADER_CONF_API_H # define HEADER_CONF_API_H -# include <openssl/lhash.h> -# include <openssl/conf.h> +# include "openssl/lhash.h" +# include "openssl/conf.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/crypto.h b/openssl/include/mac/openssl/crypto.h index bd0b140827..c1a9df302b 100644 --- a/openssl/include/mac/openssl/crypto.h +++ b/openssl/include/mac/openssl/crypto.h @@ -19,30 +19,30 @@ # include <stdlib.h> # include <time.h> -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # endif -# include <openssl/stack.h> -# include <openssl/safestack.h> -# include <openssl/opensslv.h> -# include <openssl/ossl_typ.h> -# include <openssl/opensslconf.h> +# include "openssl/stack.h" +# include "openssl/safestack.h" +# include "openssl/opensslv.h" +# include "openssl/ossl_typ.h" +# include "openssl/opensslconf.h" # ifdef CHARSET_EBCDIC -# include <openssl/ebcdic.h> +# include "openssl/ebcdic.h" # endif /* * Resolve problems on some operating systems with symbol names that clash * one way or another */ -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/opensslv.h> +# include "openssl/opensslv.h" # endif #ifdef __cplusplus diff --git a/openssl/include/mac/openssl/ct.h b/openssl/include/mac/openssl/ct.h index 6c63265257..c589c3cb75 100644 --- a/openssl/include/mac/openssl/ct.h +++ b/openssl/include/mac/openssl/ct.h @@ -10,12 +10,12 @@ #ifndef HEADER_CT_H # define HEADER_CT_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_CT -# include <openssl/ossl_typ.h> -# include <openssl/safestack.h> -# include <openssl/x509.h> +# include "openssl/ossl_typ.h" +# include "openssl/safestack.h" +# include "openssl/x509.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/mac/openssl/des.h b/openssl/include/mac/openssl/des.h index be4abbdfd0..0dca422cdd 100644 --- a/openssl/include/mac/openssl/des.h +++ b/openssl/include/mac/openssl/des.h @@ -10,7 +10,7 @@ #ifndef HEADER_DES_H # define HEADER_DES_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_DES # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/dh.h b/openssl/include/mac/openssl/dh.h index ae309e7b31..51ff7ac05a 100644 --- a/openssl/include/mac/openssl/dh.h +++ b/openssl/include/mac/openssl/dh.h @@ -10,15 +10,15 @@ #ifndef HEADER_DH_H # define HEADER_DH_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_DH -# include <openssl/e_os2.h> -# include <openssl/bio.h> -# include <openssl/asn1.h> -# include <openssl/ossl_typ.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" +# include "openssl/asn1.h" +# include "openssl/ossl_typ.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/dsa.h b/openssl/include/mac/openssl/dsa.h index cb5fbc2f05..e249b3e7ae 100644 --- a/openssl/include/mac/openssl/dsa.h +++ b/openssl/include/mac/openssl/dsa.h @@ -15,20 +15,20 @@ #ifndef HEADER_DSA_H # define HEADER_DSA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_DSA # ifdef __cplusplus extern "C" { # endif -# include <openssl/e_os2.h> -# include <openssl/bio.h> -# include <openssl/crypto.h> -# include <openssl/ossl_typ.h> -# include <openssl/opensslconf.h> -# include <openssl/bn.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" +# include "openssl/crypto.h" +# include "openssl/ossl_typ.h" +# include "openssl/opensslconf.h" +# include "openssl/bn.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/dh.h> +# include "openssl/dh.h" # endif # ifndef OPENSSL_DSA_MAX_MODULUS_BITS diff --git a/openssl/include/mac/openssl/e_os2.h b/openssl/include/mac/openssl/e_os2.h index 99ea3477d7..7f57e6b826 100644 --- a/openssl/include/mac/openssl/e_os2.h +++ b/openssl/include/mac/openssl/e_os2.h @@ -10,7 +10,7 @@ #ifndef HEADER_E_OS2_H # define HEADER_E_OS2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/ec.h b/openssl/include/mac/openssl/ec.h index 656cb410e6..6b2cd5a6ef 100644 --- a/openssl/include/mac/openssl/ec.h +++ b/openssl/include/mac/openssl/ec.h @@ -24,13 +24,13 @@ #ifndef HEADER_EC_H # define HEADER_EC_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_EC -# include <openssl/asn1.h> -# include <openssl/symhacks.h> +# include "openssl/asn1.h" +# include "openssl/symhacks.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/ecdh.h b/openssl/include/mac/openssl/ecdh.h index 681f3d5e55..6481126caa 100644 --- a/openssl/include/mac/openssl/ecdh.h +++ b/openssl/include/mac/openssl/ecdh.h @@ -7,4 +7,4 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/ec.h> +#include "openssl/ec.h" diff --git a/openssl/include/mac/openssl/ecdsa.h b/openssl/include/mac/openssl/ecdsa.h index 681f3d5e55..6481126caa 100644 --- a/openssl/include/mac/openssl/ecdsa.h +++ b/openssl/include/mac/openssl/ecdsa.h @@ -7,4 +7,4 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/ec.h> +#include "openssl/ec.h" diff --git a/openssl/include/mac/openssl/engine.h b/openssl/include/mac/openssl/engine.h index 319371e425..113963b527 100644 --- a/openssl/include/mac/openssl/engine.h +++ b/openssl/include/mac/openssl/engine.h @@ -16,22 +16,22 @@ #ifndef HEADER_ENGINE_H # define HEADER_ENGINE_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_ENGINE # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> -# include <openssl/rsa.h> -# include <openssl/dsa.h> -# include <openssl/dh.h> -# include <openssl/ec.h> -# include <openssl/rand.h> -# include <openssl/ui.h> -# include <openssl/err.h> +# include "openssl/bn.h" +# include "openssl/rsa.h" +# include "openssl/dsa.h" +# include "openssl/dh.h" +# include "openssl/ec.h" +# include "openssl/rand.h" +# include "openssl/ui.h" +# include "openssl/err.h" # endif -# include <openssl/ossl_typ.h> -# include <openssl/symhacks.h> -# include <openssl/x509.h> +# include "openssl/ossl_typ.h" +# include "openssl/symhacks.h" +# include "openssl/x509.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/mac/openssl/err.h b/openssl/include/mac/openssl/err.h index f9390919ab..15931d0936 100644 --- a/openssl/include/mac/openssl/err.h +++ b/openssl/include/mac/openssl/err.h @@ -10,16 +10,16 @@ #ifndef HEADER_ERR_H # define HEADER_ERR_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifndef OPENSSL_NO_STDIO # include <stdio.h> # include <stdlib.h> # endif -# include <openssl/ossl_typ.h> -# include <openssl/bio.h> -# include <openssl/lhash.h> +# include "openssl/ossl_typ.h" +# include "openssl/bio.h" +# include "openssl/lhash.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/evp.h b/openssl/include/mac/openssl/evp.h index b9c83b2b52..1a375b7035 100644 --- a/openssl/include/mac/openssl/evp.h +++ b/openssl/include/mac/openssl/evp.h @@ -10,10 +10,10 @@ #ifndef HEADER_ENVELOPE_H # define HEADER_ENVELOPE_H -# include <openssl/opensslconf.h> -# include <openssl/ossl_typ.h> -# include <openssl/symhacks.h> -# include <openssl/bio.h> +# include "openssl/opensslconf.h" +# include "openssl/ossl_typ.h" +# include "openssl/symhacks.h" +# include "openssl/bio.h" # define EVP_MAX_MD_SIZE 64/* longest known is SHA512 */ # define EVP_MAX_KEY_LENGTH 64 @@ -24,7 +24,7 @@ /* Default PKCS#5 iteration count */ # define PKCS5_DEFAULT_ITER 2048 -# include <openssl/objects.h> +# include "openssl/objects.h" # define EVP_PK_RSA 0x0001 # define EVP_PK_DSA 0x0002 diff --git a/openssl/include/mac/openssl/hmac.h b/openssl/include/mac/openssl/hmac.h index 9f06896059..9cc2fef4a3 100644 --- a/openssl/include/mac/openssl/hmac.h +++ b/openssl/include/mac/openssl/hmac.h @@ -10,9 +10,9 @@ #ifndef HEADER_HMAC_H # define HEADER_HMAC_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" -# include <openssl/evp.h> +# include "openssl/evp.h" # define HMAC_MAX_MD_CBLOCK 128/* largest known is SHA512 */ diff --git a/openssl/include/mac/openssl/idea.h b/openssl/include/mac/openssl/idea.h index 4334f3ea71..03a4604d20 100644 --- a/openssl/include/mac/openssl/idea.h +++ b/openssl/include/mac/openssl/idea.h @@ -10,7 +10,7 @@ #ifndef HEADER_IDEA_H # define HEADER_IDEA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_IDEA # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/lhash.h b/openssl/include/mac/openssl/lhash.h index e2ccb65d69..0bdacbda63 100644 --- a/openssl/include/mac/openssl/lhash.h +++ b/openssl/include/mac/openssl/lhash.h @@ -14,8 +14,8 @@ #ifndef HEADER_LHASH_H # define HEADER_LHASH_H -# include <openssl/e_os2.h> -# include <openssl/bio.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/md2.h b/openssl/include/mac/openssl/md2.h index 7faf8e3d65..5738c608e9 100644 --- a/openssl/include/mac/openssl/md2.h +++ b/openssl/include/mac/openssl/md2.h @@ -10,7 +10,7 @@ #ifndef HEADER_MD2_H # define HEADER_MD2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_MD2 # include <stddef.h> diff --git a/openssl/include/mac/openssl/md4.h b/openssl/include/mac/openssl/md4.h index 940e29db40..2421997eb9 100644 --- a/openssl/include/mac/openssl/md4.h +++ b/openssl/include/mac/openssl/md4.h @@ -10,10 +10,10 @@ #ifndef HEADER_MD4_H # define HEADER_MD4_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_MD4 -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/md5.h b/openssl/include/mac/openssl/md5.h index 2deb772118..2d90a26c2a 100644 --- a/openssl/include/mac/openssl/md5.h +++ b/openssl/include/mac/openssl/md5.h @@ -10,10 +10,10 @@ #ifndef HEADER_MD5_H # define HEADER_MD5_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_MD5 -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/mdc2.h b/openssl/include/mac/openssl/mdc2.h index aabd2bfaad..37ac79a6b8 100644 --- a/openssl/include/mac/openssl/mdc2.h +++ b/openssl/include/mac/openssl/mdc2.h @@ -10,11 +10,11 @@ #ifndef HEADER_MDC2_H # define HEADER_MDC2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" #ifndef OPENSSL_NO_MDC2 # include <stdlib.h> -# include <openssl/des.h> +# include "openssl/des.h" # ifdef __cplusplus extern "C" { # endif diff --git a/openssl/include/mac/openssl/objects.h b/openssl/include/mac/openssl/objects.h index 09d614ffc0..5fc519ab52 100644 --- a/openssl/include/mac/openssl/objects.h +++ b/openssl/include/mac/openssl/objects.h @@ -13,7 +13,7 @@ # define USE_OBJ_MAC # ifdef USE_OBJ_MAC -# include <openssl/obj_mac.h> +# include "openssl/obj_mac.h" # else # define SN_undef "UNDEF" # define LN_undef "undefined" @@ -912,8 +912,8 @@ # define OBJ_OCSP_sign OBJ_id_kp,9L # endif /* USE_OBJ_MAC */ -# include <openssl/bio.h> -# include <openssl/asn1.h> +# include "openssl/bio.h" +# include "openssl/asn1.h" # define OBJ_NAME_TYPE_UNDEF 0x00 # define OBJ_NAME_TYPE_MD_METH 0x01 diff --git a/openssl/include/mac/openssl/ocsp.h b/openssl/include/mac/openssl/ocsp.h index 08debc5b78..c09e43078e 100644 --- a/openssl/include/mac/openssl/ocsp.h +++ b/openssl/include/mac/openssl/ocsp.h @@ -10,7 +10,7 @@ #ifndef HEADER_OCSP_H # define HEADER_OCSP_H -#include <openssl/opensslconf.h> +#include "openssl/opensslconf.h" /* * These definitions are outside the OPENSSL_NO_OCSP guard because although for @@ -41,10 +41,10 @@ # ifndef OPENSSL_NO_OCSP -# include <openssl/ossl_typ.h> -# include <openssl/x509.h> -# include <openssl/x509v3.h> -# include <openssl/safestack.h> +# include "openssl/ossl_typ.h" +# include "openssl/x509.h" +# include "openssl/x509v3.h" +# include "openssl/safestack.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/ossl_typ.h b/openssl/include/mac/openssl/ossl_typ.h index 129a67f057..23641a6bc3 100644 --- a/openssl/include/mac/openssl/ossl_typ.h +++ b/openssl/include/mac/openssl/ossl_typ.h @@ -16,7 +16,7 @@ extern "C" { #endif -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # ifdef NO_ASN1_TYPEDEFS # define ASN1_INTEGER ASN1_STRING diff --git a/openssl/include/mac/openssl/pem.h b/openssl/include/mac/openssl/pem.h index 2375d63553..42184ab73f 100644 --- a/openssl/include/mac/openssl/pem.h +++ b/openssl/include/mac/openssl/pem.h @@ -10,12 +10,12 @@ #ifndef HEADER_PEM_H # define HEADER_PEM_H -# include <openssl/e_os2.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/evp.h> -# include <openssl/x509.h> -# include <openssl/pem2.h> +# include "openssl/e_os2.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/evp.h" +# include "openssl/x509.h" +# include "openssl/pem2.h" #ifdef __cplusplus extern "C" { @@ -326,7 +326,7 @@ int PEM_def_callback(char *buf, int num, int w, void *key); void PEM_proc_type(char *buf, int type); void PEM_dek_info(char *buf, const char *type, int len, char *str); -# include <openssl/symhacks.h> +# include "openssl/symhacks.h" DECLARE_PEM_rw(X509, X509) DECLARE_PEM_rw(X509_AUX, X509) diff --git a/openssl/include/mac/openssl/pkcs12.h b/openssl/include/mac/openssl/pkcs12.h index deaded9df9..c17936fcf9 100644 --- a/openssl/include/mac/openssl/pkcs12.h +++ b/openssl/include/mac/openssl/pkcs12.h @@ -10,8 +10,8 @@ #ifndef HEADER_PKCS12_H # define HEADER_PKCS12_H -# include <openssl/bio.h> -# include <openssl/x509.h> +# include "openssl/bio.h" +# include "openssl/x509.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/pkcs7.h b/openssl/include/mac/openssl/pkcs7.h index 691f722022..7e9ebcd38f 100644 --- a/openssl/include/mac/openssl/pkcs7.h +++ b/openssl/include/mac/openssl/pkcs7.h @@ -10,12 +10,12 @@ #ifndef HEADER_PKCS7_H # define HEADER_PKCS7_H -# include <openssl/asn1.h> -# include <openssl/bio.h> -# include <openssl/e_os2.h> +# include "openssl/asn1.h" +# include "openssl/bio.h" +# include "openssl/e_os2.h" -# include <openssl/symhacks.h> -# include <openssl/ossl_typ.h> +# include "openssl/symhacks.h" +# include "openssl/ossl_typ.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/rand.h b/openssl/include/mac/openssl/rand.h index d521ae192a..e3ecb1a32f 100644 --- a/openssl/include/mac/openssl/rand.h +++ b/openssl/include/mac/openssl/rand.h @@ -11,8 +11,8 @@ # define HEADER_RAND_H # include <stdlib.h> -# include <openssl/ossl_typ.h> -# include <openssl/e_os2.h> +# include "openssl/ossl_typ.h" +# include "openssl/e_os2.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/rc2.h b/openssl/include/mac/openssl/rc2.h index 585f9e4c38..40e8ab2e43 100644 --- a/openssl/include/mac/openssl/rc2.h +++ b/openssl/include/mac/openssl/rc2.h @@ -10,7 +10,7 @@ #ifndef HEADER_RC2_H # define HEADER_RC2_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RC2 # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/rc4.h b/openssl/include/mac/openssl/rc4.h index 86803b37fb..1755e7e749 100644 --- a/openssl/include/mac/openssl/rc4.h +++ b/openssl/include/mac/openssl/rc4.h @@ -10,7 +10,7 @@ #ifndef HEADER_RC4_H # define HEADER_RC4_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RC4 # include <stddef.h> diff --git a/openssl/include/mac/openssl/rc5.h b/openssl/include/mac/openssl/rc5.h index 793f88e4e8..997f152f90 100644 --- a/openssl/include/mac/openssl/rc5.h +++ b/openssl/include/mac/openssl/rc5.h @@ -10,7 +10,7 @@ #ifndef HEADER_RC5_H # define HEADER_RC5_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RC5 # ifdef __cplusplus diff --git a/openssl/include/mac/openssl/ripemd.h b/openssl/include/mac/openssl/ripemd.h index c42026aa42..1fe7399a93 100644 --- a/openssl/include/mac/openssl/ripemd.h +++ b/openssl/include/mac/openssl/ripemd.h @@ -10,10 +10,10 @@ #ifndef HEADER_RIPEMD_H # define HEADER_RIPEMD_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" #ifndef OPENSSL_NO_RMD160 -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/rsa.h b/openssl/include/mac/openssl/rsa.h index 4d6e9cc9a9..96eccf749e 100644 --- a/openssl/include/mac/openssl/rsa.h +++ b/openssl/include/mac/openssl/rsa.h @@ -10,15 +10,15 @@ #ifndef HEADER_RSA_H # define HEADER_RSA_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_RSA -# include <openssl/asn1.h> -# include <openssl/bio.h> -# include <openssl/crypto.h> -# include <openssl/ossl_typ.h> +# include "openssl/asn1.h" +# include "openssl/bio.h" +# include "openssl/crypto.h" +# include "openssl/ossl_typ.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/bn.h> +# include "openssl/bn.h" # endif # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/safestack.h b/openssl/include/mac/openssl/safestack.h index 9fe733c24e..34874f7b93 100644 --- a/openssl/include/mac/openssl/safestack.h +++ b/openssl/include/mac/openssl/safestack.h @@ -10,8 +10,8 @@ #ifndef HEADER_SAFESTACK_H # define HEADER_SAFESTACK_H -# include <openssl/stack.h> -# include <openssl/e_os2.h> +# include "openssl/stack.h" +# include "openssl/e_os2.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/seed.h b/openssl/include/mac/openssl/seed.h index bb97131d76..010124143e 100644 --- a/openssl/include/mac/openssl/seed.h +++ b/openssl/include/mac/openssl/seed.h @@ -35,11 +35,11 @@ #ifndef HEADER_SEED_H # define HEADER_SEED_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_SEED -# include <openssl/e_os2.h> -# include <openssl/crypto.h> +# include "openssl/e_os2.h" +# include "openssl/crypto.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/sha.h b/openssl/include/mac/openssl/sha.h index 6a1eb0de8b..7ea1722eea 100644 --- a/openssl/include/mac/openssl/sha.h +++ b/openssl/include/mac/openssl/sha.h @@ -10,7 +10,7 @@ #ifndef HEADER_SHA_H # define HEADER_SHA_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> #ifdef __cplusplus diff --git a/openssl/include/mac/openssl/srp.h b/openssl/include/mac/openssl/srp.h index f2b6ec750d..e17c753203 100644 --- a/openssl/include/mac/openssl/srp.h +++ b/openssl/include/mac/openssl/srp.h @@ -10,14 +10,14 @@ #ifndef HEADER_SRP_H # define HEADER_SRP_H -#include <openssl/opensslconf.h> +#include "openssl/opensslconf.h" #ifndef OPENSSL_NO_SRP # include <stdio.h> # include <string.h> -# include <openssl/safestack.h> -# include <openssl/bn.h> -# include <openssl/crypto.h> +# include "openssl/safestack.h" +# include "openssl/bn.h" +# include "openssl/crypto.h" # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/srtp.h b/openssl/include/mac/openssl/srtp.h index 5ddfa46d9b..6bc4a6d2a3 100644 --- a/openssl/include/mac/openssl/srtp.h +++ b/openssl/include/mac/openssl/srtp.h @@ -16,7 +16,7 @@ #ifndef HEADER_D1_SRTP_H # define HEADER_D1_SRTP_H -# include <openssl/ssl.h> +# include "openssl/ssl.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/ssl.h b/openssl/include/mac/openssl/ssl.h index 86ab9125de..cc520052b0 100644 --- a/openssl/include/mac/openssl/ssl.h +++ b/openssl/include/mac/openssl/ssl.h @@ -42,23 +42,23 @@ #ifndef HEADER_SSL_H # define HEADER_SSL_H -# include <openssl/e_os2.h> -# include <openssl/opensslconf.h> -# include <openssl/comp.h> -# include <openssl/bio.h> +# include "openssl/e_os2.h" +# include "openssl/opensslconf.h" +# include "openssl/comp.h" +# include "openssl/bio.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/x509.h> -# include <openssl/crypto.h> -# include <openssl/lhash.h> -# include <openssl/buffer.h> +# include "openssl/x509.h" +# include "openssl/crypto.h" +# include "openssl/lhash.h" +# include "openssl/buffer.h" # endif -# include <openssl/pem.h> -# include <openssl/hmac.h> -# include <openssl/async.h> +# include "openssl/pem.h" +# include "openssl/hmac.h" +# include "openssl/async.h" -# include <openssl/safestack.h> -# include <openssl/symhacks.h> -# include <openssl/ct.h> +# include "openssl/safestack.h" +# include "openssl/symhacks.h" +# include "openssl/ct.h" #ifdef __cplusplus extern "C" { @@ -804,11 +804,11 @@ __owur int SSL_extension_supported(unsigned int ext_type); } #endif -# include <openssl/ssl2.h> -# include <openssl/ssl3.h> -# include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */ -# include <openssl/dtls1.h> /* Datagram TLS */ -# include <openssl/srtp.h> /* Support for the use_srtp extension */ +# include "openssl/ssl2.h" +# include "openssl/ssl3.h" +# include "openssl/tls1.h" /* This is mostly sslv3 with a few tweaks */ +# include "openssl/dtls1.h" /* Datagram TLS */ +# include "openssl/srtp.h" /* Support for the use_srtp extension */ #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/ssl3.h b/openssl/include/mac/openssl/ssl3.h index aca1922306..d46c28ff0d 100644 --- a/openssl/include/mac/openssl/ssl3.h +++ b/openssl/include/mac/openssl/ssl3.h @@ -16,10 +16,10 @@ #ifndef HEADER_SSL3_H # define HEADER_SSL3_H -# include <openssl/comp.h> -# include <openssl/buffer.h> -# include <openssl/evp.h> -# include <openssl/ssl.h> +# include "openssl/comp.h" +# include "openssl/buffer.h" +# include "openssl/evp.h" +# include "openssl/ssl.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/symhacks.h b/openssl/include/mac/openssl/symhacks.h index caf1f1a75d..61b4ba478b 100644 --- a/openssl/include/mac/openssl/symhacks.h +++ b/openssl/include/mac/openssl/symhacks.h @@ -10,7 +10,7 @@ #ifndef HEADER_SYMHACKS_H # define HEADER_SYMHACKS_H -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" /* Case insensitive linking causes problems.... */ # if defined(OPENSSL_SYS_VMS) diff --git a/openssl/include/mac/openssl/tls1.h b/openssl/include/mac/openssl/tls1.h index 23e382cdd3..3173c8be9a 100644 --- a/openssl/include/mac/openssl/tls1.h +++ b/openssl/include/mac/openssl/tls1.h @@ -50,8 +50,8 @@ #ifndef HEADER_TLS1_H # define HEADER_TLS1_H -# include <openssl/buffer.h> -# include <openssl/x509.h> +# include "openssl/buffer.h" +# include "openssl/x509.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/ts.h b/openssl/include/mac/openssl/ts.h index a5659825fb..2ec087f0dc 100644 --- a/openssl/include/mac/openssl/ts.h +++ b/openssl/include/mac/openssl/ts.h @@ -10,25 +10,25 @@ #ifndef HEADER_TS_H # define HEADER_TS_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_TS -# include <openssl/symhacks.h> -# include <openssl/buffer.h> -# include <openssl/evp.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/asn1.h> -# include <openssl/safestack.h> -# include <openssl/rsa.h> -# include <openssl/dsa.h> -# include <openssl/dh.h> +# include "openssl/symhacks.h" +# include "openssl/buffer.h" +# include "openssl/evp.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/asn1.h" +# include "openssl/safestack.h" +# include "openssl/rsa.h" +# include "openssl/dsa.h" +# include "openssl/dh.h" # ifdef __cplusplus extern "C" { # endif -# include <openssl/x509.h> -# include <openssl/x509v3.h> +# include "openssl/x509.h" +# include "openssl/x509v3.h" typedef struct TS_msg_imprint_st TS_MSG_IMPRINT; typedef struct TS_req_st TS_REQ; diff --git a/openssl/include/mac/openssl/txt_db.h b/openssl/include/mac/openssl/txt_db.h index 0e6c943e0e..e94743a756 100644 --- a/openssl/include/mac/openssl/txt_db.h +++ b/openssl/include/mac/openssl/txt_db.h @@ -10,10 +10,10 @@ #ifndef HEADER_TXT_DB_H # define HEADER_TXT_DB_H -# include <openssl/opensslconf.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/lhash.h> +# include "openssl/opensslconf.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/lhash.h" # define DB_ERROR_OK 0 # define DB_ERROR_MALLOC 1 diff --git a/openssl/include/mac/openssl/ui.h b/openssl/include/mac/openssl/ui.h index 26f4f04495..ad97a85c09 100644 --- a/openssl/include/mac/openssl/ui.h +++ b/openssl/include/mac/openssl/ui.h @@ -10,15 +10,15 @@ #ifndef HEADER_UI_H # define HEADER_UI_H -# include <openssl/opensslconf.h> +# include "openssl/opensslconf.h" # ifndef OPENSSL_NO_UI # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/crypto.h> +# include "openssl/crypto.h" # endif -# include <openssl/safestack.h> -# include <openssl/ossl_typ.h> +# include "openssl/safestack.h" +# include "openssl/ossl_typ.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/whrlpool.h b/openssl/include/mac/openssl/whrlpool.h index 20ea3503b7..685a90978f 100644 --- a/openssl/include/mac/openssl/whrlpool.h +++ b/openssl/include/mac/openssl/whrlpool.h @@ -10,10 +10,10 @@ #ifndef HEADER_WHRLPOOL_H # define HEADER_WHRLPOOL_H -#include <openssl/opensslconf.h> +#include "openssl/opensslconf.h" # ifndef OPENSSL_NO_WHIRLPOOL -# include <openssl/e_os2.h> +# include "openssl/e_os2.h" # include <stddef.h> # ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/x509.h b/openssl/include/mac/openssl/x509.h index c8996f3520..6e69437787 100644 --- a/openssl/include/mac/openssl/x509.h +++ b/openssl/include/mac/openssl/x509.h @@ -16,24 +16,24 @@ #ifndef HEADER_X509_H # define HEADER_X509_H -# include <openssl/e_os2.h> -# include <openssl/ossl_typ.h> -# include <openssl/symhacks.h> -# include <openssl/buffer.h> -# include <openssl/evp.h> -# include <openssl/bio.h> -# include <openssl/stack.h> -# include <openssl/asn1.h> -# include <openssl/safestack.h> -# include <openssl/ec.h> +# include "openssl/e_os2.h" +# include "openssl/ossl_typ.h" +# include "openssl/symhacks.h" +# include "openssl/buffer.h" +# include "openssl/evp.h" +# include "openssl/bio.h" +# include "openssl/stack.h" +# include "openssl/asn1.h" +# include "openssl/safestack.h" +# include "openssl/ec.h" # if OPENSSL_API_COMPAT < 0x10100000L -# include <openssl/rsa.h> -# include <openssl/dsa.h> -# include <openssl/dh.h> +# include "openssl/rsa.h" +# include "openssl/dsa.h" +# include "openssl/dh.h" # endif -# include <openssl/sha.h> +# include "openssl/sha.h" #ifdef __cplusplus extern "C" { @@ -306,8 +306,8 @@ typedef struct PBKDF2PARAM_st { } #endif -# include <openssl/x509_vfy.h> -# include <openssl/pkcs7.h> +# include "openssl/x509_vfy.h" +# include "openssl/pkcs7.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/x509_vfy.h b/openssl/include/mac/openssl/x509_vfy.h index cab8005eee..3ea046e342 100644 --- a/openssl/include/mac/openssl/x509_vfy.h +++ b/openssl/include/mac/openssl/x509_vfy.h @@ -14,14 +14,14 @@ * Protect against recursion, x509.h and x509_vfy.h each include the other. */ # ifndef HEADER_X509_H -# include <openssl/x509.h> +# include "openssl/x509.h" # endif -# include <openssl/opensslconf.h> -# include <openssl/lhash.h> -# include <openssl/bio.h> -# include <openssl/crypto.h> -# include <openssl/symhacks.h> +# include "openssl/opensslconf.h" +# include "openssl/lhash.h" +# include "openssl/bio.h" +# include "openssl/crypto.h" +# include "openssl/symhacks.h" #ifdef __cplusplus extern "C" { diff --git a/openssl/include/mac/openssl/x509v3.h b/openssl/include/mac/openssl/x509v3.h index f21ce7c126..6f35b41255 100644 --- a/openssl/include/mac/openssl/x509v3.h +++ b/openssl/include/mac/openssl/x509v3.h @@ -10,9 +10,9 @@ #ifndef HEADER_X509V3_H # define HEADER_X509V3_H -# include <openssl/bio.h> -# include <openssl/x509.h> -# include <openssl/conf.h> +# include "openssl/bio.h" +# include "openssl/x509.h" +# include "openssl/conf.h" #ifdef __cplusplus extern "C" { diff --git a/version.json b/version.json index e6f81035b1..8d6299c0a5 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "prebuilt_libs_version":"metal-support-3", + "prebuilt_libs_version":"v3-deps-158", "freetype":"2.5.5", "curl":"7.52.1", "jpeg":"9.0", diff --git a/websockets/include/ios/libwebsockets.h b/websockets/include/ios/libwebsockets.h index 460c732602..af0dcf1679 100644 --- a/websockets/include/ios/libwebsockets.h +++ b/websockets/include/ios/libwebsockets.h @@ -170,7 +170,7 @@ typedef unsigned long long lws_intptr_t; #include <ev.h> #endif /* LWS_WITH_LIBEV */ #ifdef LWS_WITH_LIBUV -#include <uv.h> +#include "uv.h" #ifdef LWS_HAVE_UV_VERSION_H #include <uv-version.h> #endif @@ -211,9 +211,9 @@ typedef unsigned long long lws_intptr_t; #endif #include <mbedtls/ssl.h> #endif -#include <openssl/ssl.h> +#include "openssl/ssl.h" #if !defined(LWS_WITH_MBEDTLS) -#include <openssl/err.h> +#include "openssl/err.h" #endif #endif /* not USE_WOLFSSL */ #endif diff --git a/websockets/include/mac/libwebsockets.h b/websockets/include/mac/libwebsockets.h index 460c732602..af0dcf1679 100644 --- a/websockets/include/mac/libwebsockets.h +++ b/websockets/include/mac/libwebsockets.h @@ -170,7 +170,7 @@ typedef unsigned long long lws_intptr_t; #include <ev.h> #endif /* LWS_WITH_LIBEV */ #ifdef LWS_WITH_LIBUV -#include <uv.h> +#include "uv.h" #ifdef LWS_HAVE_UV_VERSION_H #include <uv-version.h> #endif @@ -211,9 +211,9 @@ typedef unsigned long long lws_intptr_t; #endif #include <mbedtls/ssl.h> #endif -#include <openssl/ssl.h> +#include "openssl/ssl.h" #if !defined(LWS_WITH_MBEDTLS) -#include <openssl/err.h> +#include "openssl/err.h" #endif #endif /* not USE_WOLFSSL */ #endif