From cab9d5a57dc56c47ba4db51b813fac618694c9a9 Mon Sep 17 00:00:00 2001 From: Andrzej Perczak Date: Fri, 19 Mar 2021 22:10:50 +0100 Subject: [PATCH] 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. --- src/hb-config.hh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hb-config.hh b/src/hb-config.hh index fc8d424bf..111058c8e 100644 --- a/src/hb-config.hh +++ b/src/hb-config.hh @@ -86,6 +86,9 @@ #define HB_NO_LEGACY #endif +#ifdef HAVE_CONFIG_OVERRIDE_H +#include "config-override.h" +#endif /* Closure of options. */ @@ -155,9 +158,5 @@ #endif #endif -#ifdef HAVE_CONFIG_OVERRIDE_H -#include "config-override.h" -#endif - #endif /* HB_CONFIG_HH */