Attachment 96275 Details for Bug 70492 – Fix compilation with bionic libc

[patch] Fix compilation with bionic libc

0001-Fix-compilation-with-bionic-libc.patch (text/plain), 4.17 KB, created by Adrian Johnson on 2014-03-24 08:43:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2014-03-24 08:43:44 UTC

Size: 4.17 KB

patch

obsolete

>From 458b2c6b544f30bfb75891f24d0cc8b97cc84d44 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Mon, 24 Mar 2014 19:08:10 +1030
>Subject: [PATCH] Fix compilation with bionic libc
>
>Bug 70492
>---
> src/cairo-cff-subset.c    |    4 +---
> src/cairo-misc.c          |   17 +++++++++++++++++
> src/cairo-output-stream.c |    5 +----
> src/cairo-type1-subset.c  |    5 +----
> src/cairoint.h            |    3 +++
> 5 files changed, 23 insertions(+), 11 deletions(-)
>
>diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
>index 1ae032c..605e94d 100644
>--- a/src/cairo-cff-subset.c
>+++ b/src/cairo-cff-subset.c
>@@ -295,7 +295,6 @@ decode_nibble (int n, char *buf)
> static unsigned char *
> decode_real (unsigned char *p, double *real)
> {
>-    struct lconv *locale_data;
>     const char *decimal_point;
>     int decimal_point_len;
>     int n;
>@@ -305,8 +304,7 @@ decode_real (unsigned char *p, double *real)
>     char *buf = buffer;
>     char *buf_end = buffer + sizeof (buffer);
> 
>-    locale_data = localeconv ();
>-    decimal_point = locale_data->decimal_point;
>+    decimal_point = cairo_get_locale_decimal_point ();
>     decimal_point_len = strlen (decimal_point);
> 
>     assert (decimal_point_len != 0);
>diff --git a/src/cairo-misc.c b/src/cairo-misc.c
>index 7575d42..8cb6a55 100644
>--- a/src/cairo-misc.c
>+++ b/src/cairo-misc.c
>@@ -41,6 +41,8 @@
> #include "cairoint.h"
> #include "cairo-error-private.h"
> 
>+#include <locale.h>
>+
> COMPILE_TIME_ASSERT ((int)CAIRO_STATUS_LAST_STATUS < (int)CAIRO_INT_STATUS_UNSUPPORTED);
> COMPILE_TIME_ASSERT (CAIRO_INT_STATUS_LAST_STATUS <= 127);
> 
>@@ -759,6 +761,21 @@ _cairo_half_from_float (float f)
>     }
> }
> 
>+const char *
>+cairo_get_locale_decimal_point (void)
>+{
>+    const char *decimal_point;
>+#ifndef __BIONIC__
>+    struct lconv *locale_data;
>+
>+    locale_data = localeconv ();
>+    decimal_point = locale_data->decimal_point;
>+#else
>+    decimal_point = ".";
>+#endif
>+
>+    return decimal_point;
>+}
> 
> #ifdef _WIN32
> 
>diff --git a/src/cairo-output-stream.c b/src/cairo-output-stream.c
>index 6d6c180..369a59b 100644
>--- a/src/cairo-output-stream.c
>+++ b/src/cairo-output-stream.c
>@@ -43,7 +43,6 @@
> #include "cairo-compiler-private.h"
> 
> #include <stdio.h>
>-#include <locale.h>
> #include <errno.h>
> 
> /* Numbers printed with %f are printed with this number of significant
>@@ -303,7 +302,6 @@ _cairo_output_stream_write_hex_string (cairo_output_stream_t *stream,
> static void
> _cairo_dtostr (char *buffer, size_t size, double d, cairo_bool_t limited_precision)
> {
>-    struct lconv *locale_data;
>     const char *decimal_point;
>     int decimal_point_len;
>     char *p;
>@@ -314,8 +312,7 @@ _cairo_dtostr (char *buffer, size_t size, double d, cairo_bool_t limited_precisi
>     if (d == 0.0)
> 	d = 0.0;
> 
>-    locale_data = localeconv ();
>-    decimal_point = locale_data->decimal_point;
>+    decimal_point = cairo_get_locale_decimal_point ();
>     decimal_point_len = strlen (decimal_point);
> 
>     assert (decimal_point_len != 0);
>diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
>index 47d85b2..b156635 100644
>--- a/src/cairo-type1-subset.c
>+++ b/src/cairo-type1-subset.c
>@@ -53,7 +53,6 @@
> #include "cairo-output-stream-private.h"
> 
> #include <ctype.h>
>-#include <locale.h>
> 
> #define TYPE1_STACKSIZE 24 /* Defined in Type 1 Font Format */
> 
>@@ -309,12 +308,10 @@ cairo_type1_font_subset_get_matrix (cairo_type1_font_subset_t *font,
>     const char *start, *end, *segment_end;
>     int ret, s_max, i, j;
>     char *s;
>-    struct lconv *locale_data;
>     const char *decimal_point;
>     int decimal_point_len;
> 
>-    locale_data = localeconv ();
>-    decimal_point = locale_data->decimal_point;
>+    decimal_point = cairo_get_locale_decimal_point ();
>     decimal_point_len = strlen (decimal_point);
> 
>     assert (decimal_point_len != 0);
>diff --git a/src/cairoint.h b/src/cairoint.h
>index 44e0ec5..e972a7f 100644
>--- a/src/cairoint.h
>+++ b/src/cairoint.h
>@@ -871,6 +871,9 @@ _cairo_intern_string (const char **str_inout, int len);
> cairo_private void
> _cairo_intern_string_reset_static_data (void);
> 
>+cairo_private const char *
>+cairo_get_locale_decimal_point (void);
>+
> /* cairo-path-fixed.c */
> cairo_private cairo_path_fixed_t *
> _cairo_path_fixed_create (void);
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 70492: 87664 | 87665 | 96275

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.