walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hb-config: Include config-override earlier 

Currently config-override.h is included at the end of this file. This caused a problem for me while undefing HB_DISABLE_DEPRECATED, namely HB_IF_NOT_DEPRECATED was defined before actual undef took place and broke the whole build. I believe it would break builds for some other defines, too. Moving config-override.h include right after predefined configs is more sane and fixes all potential problems with includes.
This commit is contained in:
Andrzej Perczak 2021-03-19 22:10:50 +01:00 committed by Behdad Esfahbod
parent adca4ce071
commit cab9d5a57d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-config.hh
View File

@ -86,6 +86,9 @@
#define HB_NO_LEGACY #define HB_NO_LEGACY
#endif #endif
#ifdef HAVE_CONFIG_OVERRIDE_H
#include "config-override.h"
#endif
/* Closure of options. */ /* Closure of options. */
@ -155,9 +158,5 @@
#endif #endif
#endif #endif
#ifdef HAVE_CONFIG_OVERRIDE_H
#include "config-override.h"
#endif
#endif /* HB_CONFIG_HH */ #endif /* HB_CONFIG_HH */