Annotation of /trunk/java6-openjdk/patches/java6-openjdk-6.1.11.3-giflib5.patch
Parent Directory | Revision Log
Revision 1883 -
(hide annotations)
(download)
Fri Aug 24 12:35:29 2012 UTC (11 years, 9 months ago) by niro
File size: 749 byte(s)
Fri Aug 24 12:35:29 2012 UTC (11 years, 9 months ago) by niro
File size: 749 byte(s)
-fix ftbfs against giflib-5
1 | niro | 1883 | --- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2011-11-14 23:12:12.000000000 +0100 |
2 | +++ openjdk-magellan/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2012-08-24 12:50:12.476981142 +0200 | ||
3 | @@ -26,7 +26,7 @@ | ||
4 | #include "splashscreen_impl.h" | ||
5 | #include "splashscreen_gfx.h" | ||
6 | |||
7 | -#include "../giflib/gif_lib.h" | ||
8 | +#include <gif_lib.h> | ||
9 | |||
10 | #define GIF_TRANSPARENT 0x01 | ||
11 | #define GIF_USER_INPUT 0x02 | ||
12 | @@ -318,7 +318,9 @@ | ||
13 | int | ||
14 | SplashDecodeGifStream(Splash * splash, SplashStream * stream) | ||
15 | { | ||
16 | - GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc); | ||
17 | + int ErrorCode; | ||
18 | + | ||
19 | + GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &ErrorCode); | ||
20 | |||
21 | if (!gif) | ||
22 | return 0; |