diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch')
-rw-r--r-- | meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch new file mode 100644 index 000000000..a28808b8d --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Sat, 9 Mar 2013 12:47:06 +0100 | ||
4 | Subject: [PATCH] workaround void pointer arithmetic | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | fixes errors like: | ||
10 | error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] | ||
11 | |||
12 | Upstream-Status: Inappropriate [configuration] | ||
13 | |||
14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
15 | --- | ||
16 | gedit/gedit-document-input-stream.c | 4 ++-- | ||
17 | gedit/gedit-smart-charset-converter.c | 2 +- | ||
18 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c | ||
21 | index 5a1f961..38316e7 100644 | ||
22 | --- a/gedit/gedit-document-input-stream.c | ||
23 | +++ b/gedit/gedit-document-input-stream.c | ||
24 | @@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream *stream, | ||
25 | |||
26 | do | ||
27 | { | ||
28 | - n = read_line (dstream, buffer + read, space_left); | ||
29 | + n = read_line (dstream, ((char*)buffer) + read, space_left); | ||
30 | read += n; | ||
31 | space_left -= n; | ||
32 | } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0); | ||
33 | @@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream *stream, | ||
34 | |||
35 | newline = get_new_line (dstream); | ||
36 | |||
37 | - memcpy (buffer + read, newline, newline_size); | ||
38 | + memcpy (((char*)buffer) + read, newline, newline_size); | ||
39 | |||
40 | read += newline_size; | ||
41 | dstream->priv->newline_added = TRUE; | ||
42 | diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c | ||
43 | index e32b0b1..6745ce3 100644 | ||
44 | --- a/gedit/gedit-smart-charset-converter.c | ||
45 | +++ b/gedit/gedit-smart-charset-converter.c | ||
46 | @@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter, | ||
47 | do | ||
48 | { | ||
49 | res = g_converter_convert (G_CONVERTER (converter), | ||
50 | - inbuf + nread, | ||
51 | + ((const char*)inbuf) + nread, | ||
52 | inbuf_size - nread, | ||
53 | out + nwritten, | ||
54 | out_size - nwritten, | ||
55 | -- | ||
56 | 1.7.4.4 | ||
57 | |||