1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From: Nicholas Luedtke <nicholas.luedtke@hp.com>
Date: Fri, 17 Jul 2015 11:30:54 -0400
Subject: fix build failure with gcc5:
Get rid of the inline declaration. All the calls to isjisp are in different
translation units so they never get inlined.
Origin: vendor
Bug-Debian: https://bugs.debian.org/777837
Reviewed-by: gregor herrmann <gregoa@debian.org>
Last-Update: 2015-07-23
---
src/jcode.c | 2 +-
src/jcode.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/jcode.c b/src/jcode.c
index 0670aaf..c92d88a 100644
--- a/src/jcode.c
+++ b/src/jcode.c
@@ -275,7 +275,7 @@ gchar *iconv_convert2(const gchar *icode, const gchar *ocode, const gchar *orig)
return(result);
}
-inline gboolean isjisp(const gchar *buff){
+gboolean isjisp(const gchar *buff){
g_assert(buff != NULL);
if((buff[0] >= 0x21) && (buff[0] <= 0x74) &&
diff --git a/src/jcode.h b/src/jcode.h
index 06f3604..c908843 100644
--- a/src/jcode.h
+++ b/src/jcode.h
@@ -31,7 +31,7 @@ enum {
gchar *iconv_convert(const gchar *icode, const gchar *ocode, const gchar *inbuf);
gchar *iconv_convert2(const gchar *icode, const gchar *ocode, const gchar *orig);
-inline gboolean isjisp(const gchar *buff);
+gboolean isjisp(const gchar *buff);
gboolean iseuckanji(const guchar *buff);
gboolean iseuchiragana(const guchar *buff);
gboolean iseuckatakana(const guchar *buff);
|