1 files changed, 8 insertions, 9 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 51acdec4044..9be7f7c337c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -9233,18 +9233,17 @@ png_load (f, img)
 /* 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 */
+#  undef HAVE_STDLIB_H
+#  include <jpeglib.h>
+#  include <jerror.h>
+#  define HAVE_STDLIB_H 1
+#else
+#  include <jpeglib.h>
+#  include <jerror.h>
+#endif /* HAVE_STDLIB_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));