From cdcdfe61b97a0a48ccf834b6d924d187da9609be Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 8 Apr 2015 13:25:04 -0700 Subject: [PATCH] Err, instead of warn, if mutex / atomic / unicode funcs are missing Hopefully this results in fewer badly built HarfBuzz integrations. --- src/hb-unicode.cc | 8 ++++---- src/hb-warning.cc | 22 ++++++++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc index fc19006d..b598a95b 100644 --- a/src/hb-unicode.cc +++ b/src/hb-unicode.cc @@ -147,11 +147,11 @@ hb_unicode_funcs_get_default (void) #if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL) #ifdef _MSC_VER -#pragma message("Could not find any Unicode functions implementation, you have to provide your own") -#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS") +#pragma error("Could not find any Unicode functions implementation, you have to provide your own.") +#pragma error("Consider building hb-ucdn.c. If you absolutely want to build without any, check the code.") #else -#warning "Could not find any Unicode functions implementation, you have to provide your own" -#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS" +#error "Could not find any Unicode functions implementation, you have to provide your own" +#error "Consider building hb-ucdn.c. If you absolutely want to build without any, check the code." #endif #endif diff --git a/src/hb-warning.cc b/src/hb-warning.cc index e0f88e2d..e69fff23 100644 --- a/src/hb-warning.cc +++ b/src/hb-warning.cc @@ -30,26 +30,20 @@ #if defined(HB_ATOMIC_INT_NIL) #ifdef _MSC_VER -#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe") +#pragma error("Could not find any system to define atomic_int macros, library WILL NOT be thread-safe") +#pragma error("Check hb-atomic-private.hh for possible resolutions.") #else -#warning "Could not find any system to define atomic_int macros, library may NOT be thread-safe" +#error "Could not find any system to define atomic_int macros, library WILL NOT be thread-safe" +#error "Check hb-atomic-private.hh for possible resolutions." #endif #endif #if defined(HB_MUTEX_IMPL_NIL) #ifdef _MSC_VER -#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe") +#pragma error("Could not find any system to define mutex macros, library WILL NOT be thread-safe") +#pragma error("Check hb-mutex-private.hh for possible resolutions.") #else -#warning "Could not find any system to define mutex macros, library may NOT be thread-safe" +#error "Could not find any system to define mutex macros, library WILL NOT be thread-safe" +#error "Check hb-mutex-private.hh for possible resolutions." #endif #endif - -#if defined(HB_ATOMIC_INT_NIL) || defined(HB_MUTEX_IMPL_NIL) -#ifdef _MSC_VER -#pragma message("To suppress these warnings, define HB_NO_MT") -#else -#warning "To suppress these warnings, define HB_NO_MT" -#endif -#endif - - -- GitLab