diff --git a/NEWS b/NEWS index 72b853a13..db08c19d2 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ -0.4.7 - 2125-MM-DD +0.4.7 - 2015-05-DD + + * Restore support for giflib 4.1.x 0.4.6 - 2015-05-14 diff --git a/src/libming.h b/src/libming.h index 3ed0cbb52..db22bd013 100644 --- a/src/libming.h +++ b/src/libming.h @@ -75,38 +75,14 @@ typedef unsigned char BOOL; #include #endif -#ifdef HAVE_GIF_LIB_H -#include -#endif - -#ifndef __has_attribute -#define __has_attribute(x) 0 -#endif - -#if (defined(__GNUC__)) || __has_attribute(unused) -#define UNUSED(x) UNUSED_ ## x __attribute__((__unused__)) -#else -#define UNUSED(x) UNUSED_ ## x -#endif - -#if GIFLIB_MAJOR < 5 -#define GIFLIB5_ONLY(x) UNUSED(x) -#else -#define GIFLIB5_ONLY(x) x -#endif - #if GIFLIB_GIFERRORSTRING -static void -PrintGifError(int GIFLIB5_ONLY(errorCode)) -{ -#if GIFLIB_MAJOR < 5 - fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString()); -#else - fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString(errorCode)); -#endif -} +# if GIFLIB_MAJOR < 5 +# define PrintGifError(x) fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString()) +# else +# define PrintGifError(x) fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString(x)) +# endif #else -#define PrintGifError(x) PrintGifError() +# define PrintGifError(x) PrintGifError() #endif #endif /* SWF_LIBMING_H_INCLUDED */