|
|
|
|
Index: config/gdlib-config.in
|
|
|
|
|
--- config/gdlib-config.in.orig 2013-06-25 11:58:23.000000000 +0200
|
|
|
|
|
+++ config/gdlib-config.in 2015-01-03 09:57:52.740057278 +0100
|
|
|
|
|
@@ -83,8 +83,8 @@
|
|
|
|
|
echo "GD library @VERSION@"
|
|
|
|
|
echo "includedir: $includedir"
|
|
|
|
|
echo "cflags: -I@includedir@"
|
|
|
|
|
- echo "ldflags: @LDFLAGS@"
|
|
|
|
|
- echo "libs: @LIBS@ @LIBICONV@"
|
|
|
|
|
+ echo "ldflags: -L@libdir@ @LDFLAGS@"
|
|
|
|
|
+ echo "libs: -lgd @LIBS@ @LIBICONV@"
|
|
|
|
|
echo "libdir: $libdir"
|
|
|
|
|
echo "features: @FEATURES@"
|
|
|
|
|
;;
|
|
|
|
|
Index: src/gdkanji.c
|
|
|
|
|
--- src/gdkanji.c.orig 2013-06-25 11:58:23.000000000 +0200
|
|
|
|
|
+++ src/gdkanji.c 2015-01-03 09:59:47.990203246 +0100
|
|
|
|
|
@@ -27,11 +27,11 @@
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_ICONV
|
|
|
|
|
#define ICONV_CONST /**/
|
|
|
|
|
-iconv_t iconv_open (const char *, const char *);
|
|
|
|
|
-size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
|
|
|
|
|
-int iconv_close (iconv_t);
|
|
|
|
|
+static iconv_t iconv_open (const char *, const char *);
|
|
|
|
|
+static size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
|
|
|
|
|
+static int iconv_close (iconv_t);
|
|
|
|
|
|
|
|
|
|
-iconv_t
|
|
|
|
|
+static iconv_t
|
|
|
|
|
iconv_open (const char *tocode, const char *fromcode)
|
|
|
|
|
{
|
|
|
|
|
(void)tocode;
|
|
|
|
|
@@ -39,7 +39,7 @@
|
|
|
|
|
return (iconv_t) (-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-size_t
|
|
|
|
|
+static size_t
|
|
|
|
|
iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
|
|
|
|
|
char **outbuf, size_t * outbytesleft)
|
|
|
|
|
{
|
|
|
|
|
@@ -51,7 +51,7 @@
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-int
|
|
|
|
|
+static int
|
|
|
|
|
iconv_close (iconv_t cd)
|
|
|
|
|
{
|
|
|
|
|
(void)cd;
|
