From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 24 Aug 1999 19:25:06 +0000 (+0000)
Subject: [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
X-Git-Tag: emacs-pretest-21.0.90~7051
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba06aba44f276378c44a0e17de6ad62dd4748df6;p=emacs.git

[HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
being redefined in jconfig.h.
---

diff --git a/src/xfns.c b/src/xfns.c
index ea1913e47fa..468b7c37a22 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8257,10 +8257,21 @@ png_load (f, img)
 
 #if HAVE_JPEG
 
+/* Work around a warning about HAVE_STDLIB_H being redefined in
+   jconfig.h.  */
+#ifdef HAVE_STDLIB_H
+#define HAVE_STDLIB_H_1
+#undef HAVE_STDLIB_H
+#endif /* HAVE_STLIB_H */
+
 #include <jpeglib.h>
 #include <jerror.h>
 #include <setjmp.h>
 
+#ifdef HAVE_STLIB_H_1
+#define HAVE_STDLIB_H 1
+#endif
+
 static int jpeg_image_p P_ ((Lisp_Object object));
 static int jpeg_load P_ ((struct frame *f, struct image *img));