summaryrefslogtreecommitdiff
path: root/ext/gd
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2009-08-09 13:15:45 +0000
committerIlia Alshanetsky <iliaa@php.net>2009-08-09 13:15:45 +0000
commit318970768154c1cc84f089c1fac7871353af6a61 (patch)
treef1fc0504766b1cb7a3cefd6004a430b98bdc2304 /ext/gd
parentd02332b43f55cd96c7b20be7d3fe578cfcde2f1c (diff)
downloadphp-git-318970768154c1cc84f089c1fac7871353af6a61.tar.gz
Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies wrong type in declaration)
Diffstat (limited to 'ext/gd')
-rw-r--r--ext/gd/libgd/gd_compat.c2
-rw-r--r--ext/gd/libgd/gd_compat.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/libgd/gd_compat.c b/ext/gd/libgd/gd_compat.c
index bba62341ca..473ea203e5 100644
--- a/ext/gd/libgd/gd_compat.c
+++ b/ext/gd/libgd/gd_compat.c
@@ -14,7 +14,7 @@ int gdJpegGetVersionInt()
return JPEG_LIB_VERSION;
}
-int gdJpegGetVersionString()
+const char * gdJpegGetVersionString()
{
switch(JPEG_LIB_VERSION) {
case 62:
diff --git a/ext/gd/libgd/gd_compat.h b/ext/gd/libgd/gd_compat.h
index 022d0a8896..c084a0069c 100644
--- a/ext/gd/libgd/gd_compat.h
+++ b/ext/gd/libgd/gd_compat.h
@@ -8,7 +8,7 @@
#endif
const char * gdPngGetVersionString();
-int gdJpegGetVersionString();
+const char * gdJpegGetVersionString();
int gdJpegGetVersionInt();
int overflow2(int a, int b);