icu-both-elif-no-arguments.patch 750 B

1234567891011121314151617181920212223
  1. [PATCH] icu: fix #elif without arguments
  2. ParagraphLayout.cpp contains an #elif without any arguments, which
  3. g++ >= 4.4 flags as an error. Fix it by replacing it with an #else.
  4. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  5. ---
  6. source/layoutex/ParagraphLayout.cpp | 2 +-
  7. 1 file changed, 1 insertion(+), 1 deletion(-)
  8. Index: source/layoutex/ParagraphLayout.cpp
  9. ===================================================================
  10. --- source.orig/layoutex/ParagraphLayout.cpp
  11. +++ source/layoutex/ParagraphLayout.cpp
  12. @@ -813,7 +813,7 @@ le_int32 ParagraphLayout::getLanguageCod
  13. return nullLanguageCode;
  14. }
  15. -#elif
  16. +#else
  17. // TODO - dummy implementation for right now...
  18. le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)