Mercurial > hg > release > icedtea7-2.2

view patches/pr1303-ifdef_fix.patch @ 2588:03aaabc8b71c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new fixes locally (backports from u17b02 & 2.4, PR1303 fix) so as to keep with 2.2.7 forest tag. 2013-03-11 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (ICEDTEA_PATCHES): Add patches. * NEWS: Updated. * patches/8002344-krb5loginmodule.patch, * patches/8004344-toolkiterrorhandler.patch: Backported from 2.4. * patches/8006179-lookup_using_findvirtual.patch, * patches/8006882-sun.proxy.patch: Taken from upstream jdk7u17 b02. * patches/pr1303-ifdef_fix.patch: PR1303 issue (#ifdef vs. #if) caught by Bernhard Rosenkr?nzer.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 11 Mar 2013 11:39:51 +0000
parents
children
line wrap: on
line source

# HG changeset patch
# User andrew
# Date 1362758030 0
# Node ID ec275f96d030eff83f7e6cfcdd7daa9cda2b4802
# Parent  deac45dc94f0504ba17b8afcb54db1fba4e6f9d5
PR1303: Correct #ifdef to #if

diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
@@ -316,7 +316,7 @@
 int
 SplashDecodeGifStream(Splash * splash, SplashStream * stream)
 {
-#ifdef GIFLIB_MAJOR >= 5
+#if GIFLIB_MAJOR >= 5
     int error = 0;
     GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error);