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

Fix pragma usage 

https://bugs.freedesktop.org/show_bug.cgi?id=91228

Commit cdcdfe61b9 changed two `#pragma
message` to `#pragma error` in hb-unicode.cc, however MSVC uses #error,
just like the #else branch. `#pragma error` is an unknown pragma so
MSVC does not fail the build because of it, which I believe was the
intention of that commit.

If it's meant to be an #error, then the #ifdef for _MSC_VER can be
removed entirely.
This commit is contained in:
Behdad Esfahbod 2015-07-05 22:43:17 +01:00
parent 5f13bbd9d4
commit 9ae156b768
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hb-unicode.cc
View File

@ -146,14 +146,9 @@ hb_unicode_funcs_get_default (void)
} }
#if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL) #if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
#ifdef _MSC_VER
#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
#error "Could not find any Unicode functions implementation, you have to provide your own" #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." #error "Consider building hb-ucdn.c. If you absolutely want to build without any, check the code."
#endif #endif
#endif
/** /**
* hb_unicode_funcs_create: (Xconstructor) * hb_unicode_funcs_create: (Xconstructor)

10
src/hb-warning.cc
View File

@ -29,21 +29,11 @@
#if defined(HB_ATOMIC_INT_NIL) #if defined(HB_ATOMIC_INT_NIL)
#ifdef _MSC_VER
#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
#error "Could not find any system to define atomic_int macros, library WILL 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." #error "Check hb-atomic-private.hh for possible resolutions."
#endif #endif
#endif
#if defined(HB_MUTEX_IMPL_NIL) #if defined(HB_MUTEX_IMPL_NIL)
#ifdef _MSC_VER
#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
#error "Could not find any system to define mutex macros, library WILL 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." #error "Check hb-mutex-private.hh for possible resolutions."
#endif #endif
#endif