diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-08 14:27:19 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-02-08 14:27:19 +0000 |
| commit | 26ebdeff75d9f0f7b1ca2f82c35d7eaa013c0982 (patch) | |
| tree | 88626bb5c88436b0e206907f15224bb035481f6b /src/3rdparty/freetype/src/sfnt/sferrors.h | |
| parent | 30178a22ffde5d216a350910668df0d906aced3b (diff) | |
| parent | fbfacd33be482fa3cf0aa5cffaf7006d538a2f92 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/3rdparty/freetype/src/sfnt/sferrors.h')
| -rw-r--r-- | src/3rdparty/freetype/src/sfnt/sferrors.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/freetype/src/sfnt/sferrors.h b/src/3rdparty/freetype/src/sfnt/sferrors.h index e3bef3f743..74003d4b38 100644 --- a/src/3rdparty/freetype/src/sfnt/sferrors.h +++ b/src/3rdparty/freetype/src/sfnt/sferrors.h @@ -4,7 +4,7 @@ /* */ /* SFNT error codes (specification only). */ /* */ -/* Copyright 2001-2015 by */ +/* Copyright 2001-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,12 +22,12 @@ /* */ /*************************************************************************/ -#ifndef __SFERRORS_H__ -#define __SFERRORS_H__ +#ifndef SFERRORS_H_ +#define SFERRORS_H_ #include FT_MODULE_ERRORS_H -#undef __FTERRORS_H__ +#undef FTERRORS_H_ #undef FT_ERR_PREFIX #define FT_ERR_PREFIX SFNT_Err_ @@ -35,6 +35,7 @@ #include FT_ERRORS_H -#endif /* __SFERRORS_H__ */ +#endif /* SFERRORS_H_ */ + /* END */ |