*** empty log message ***

[bpt/emacs.git] / src / xfns.c

diff --git a/src/xfns.c b/src/xfns.c
index 2e5685b..e33ce55 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,5 +1,5 @@
 /* Functions for the X window system.
 /* Functions for the X window system.

-   Copyright (C) 1989, 92, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001
+   Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02

      Free Software Foundation.
 
 This file is part of GNU Emacs.
      Free Software Foundation.
 
 This file is part of GNU Emacs.


@@ -6598,6 +6598,7 @@ x_put_x_image (f, ximg, pixmap, width, height)
      struct frame *f;
      XImage *ximg;
      Pixmap pixmap;
      struct frame *f;
      XImage *ximg;
      Pixmap pixmap;

+     int width, height;

 {
   GC gc;
   
 {
   GC gc;
   


@@ -9232,17 +9233,16 @@ png_load (f, img)
 /* Work around a warning about HAVE_STDLIB_H being redefined in
    jconfig.h.  */
 #ifdef HAVE_STDLIB_H
 /* 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>
+#  undef HAVE_STDLIB_H
+#  include <jpeglib.h>
+#  undef HAVE_STDLIB_H
+#  define HAVE_STDLIB_H 1
+#else
+#  include <jpeglib.h>
+#endif /* HAVE_STDLIB_H */

 #include <jerror.h>
 #include <jerror.h>

-#include <setjmp.h>

 
 

-#ifdef HAVE_STLIB_H_1
-#define HAVE_STDLIB_H 1
-#endif
+#include <setjmp.h>

 
 static int jpeg_image_p P_ ((Lisp_Object object));
 static int jpeg_load P_ ((struct frame *f, struct image *img));
 
 static int jpeg_image_p P_ ((Lisp_Object object));
 static int jpeg_load P_ ((struct frame *f, struct image *img));