57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
|
From 17dd77cd74f0a69332c091f816162e34abff30c5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Francois Perrad <francois.perrad@gadz.org>
|
||
|
|
Date: Mon, 2 Jul 2018 00:17:44 +0200
|
||
|
|
Subject: [PATCH] locale.c: Fix conditional compilation
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
With Perl 5.28.0, there are some mismatches between blocks
|
||
|
|
and conditional compilation in the Perl__is_cur_LC_category_utf8() function.
|
||
|
|
The compilation of miniperl could fails like this:
|
||
|
|
```
|
||
|
|
locale.c: In function `Perl__is_cur_LC_category_utf8`:
|
||
|
|
locale.c:5481:1: error: expected declaration or statement at end of input
|
||
|
|
}
|
||
|
|
^
|
||
|
|
```
|
||
|
|
|
||
|
|
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||
|
|
---
|
||
|
|
locale.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/locale.c b/locale.c
|
||
|
|
index f8f77fb3d0..f2731846ad 100644
|
||
|
|
--- a/locale.c
|
||
|
|
+++ b/locale.c
|
||
|
|
@@ -4649,11 +4649,12 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category)
|
||
|
|
&& wc == (wchar_t) UNICODE_REPLACEMENT);
|
||
|
|
}
|
||
|
|
|
||
|
|
+# endif
|
||
|
|
+
|
||
|
|
restore_switched_locale(LC_CTYPE, original_ctype_locale);
|
||
|
|
goto finish_and_return;
|
||
|
|
}
|
||
|
|
|
||
|
|
-# endif
|
||
|
|
# else
|
||
|
|
|
||
|
|
/* Here, we must have a C89 compiler that doesn't have mbtowc(). Next
|
||
|
|
@@ -4885,9 +4886,9 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category)
|
||
|
|
is_utf8 = TRUE;
|
||
|
|
goto finish_and_return;
|
||
|
|
}
|
||
|
|
- }
|
||
|
|
|
||
|
|
# endif
|
||
|
|
+ }
|
||
|
|
# endif
|
||
|
|
|
||
|
|
/* Other common encodings are the ISO 8859 series, which aren't UTF-8. But
|
||
|
|
--
|
||
|
|
2.14.4
|
||
|
|
|