diff options
| author | Dave Love | 2002-07-31 22:37:38 +0000 |
|---|---|---|
| committer | Dave Love | 2002-07-31 22:37:38 +0000 |
| commit | 4fc0b72e987f4f3732e2805d6f528954c22ce8d1 (patch) | |
| tree | 3585819561949faf2320bb781c82ae2d6f1650aa /src | |
| parent | 4a35217e5d822b6984875f869e21f8ef5ff5f768 (diff) | |
| download | emacs-4fc0b72e987f4f3732e2805d6f528954c22ce8d1.tar.gz emacs-4fc0b72e987f4f3732e2805d6f528954c22ce8d1.zip | |
Change logic (instead of fixing typo).
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 17 |
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) | |||
| 9233 | /* Work around a warning about HAVE_STDLIB_H being redefined in | 9233 | /* Work around a warning about HAVE_STDLIB_H being redefined in |
| 9234 | jconfig.h. */ | 9234 | jconfig.h. */ |
| 9235 | #ifdef HAVE_STDLIB_H | 9235 | #ifdef HAVE_STDLIB_H |
| 9236 | #define HAVE_STDLIB_H_1 | 9236 | # undef HAVE_STDLIB_H |
| 9237 | #undef HAVE_STDLIB_H | 9237 | # include <jpeglib.h> |
| 9238 | #endif /* HAVE_STLIB_H */ | 9238 | # include <jerror.h> |
| 9239 | # define HAVE_STDLIB_H 1 | ||
| 9240 | #else | ||
| 9241 | # include <jpeglib.h> | ||
| 9242 | # include <jerror.h> | ||
| 9243 | #endif /* HAVE_STDLIB_H */ | ||
| 9239 | 9244 | ||
| 9240 | #include <jpeglib.h> | ||
| 9241 | #include <jerror.h> | ||
| 9242 | #include <setjmp.h> | 9245 | #include <setjmp.h> |
| 9243 | 9246 | ||
| 9244 | #ifdef HAVE_STLIB_H_1 | ||
| 9245 | #define HAVE_STDLIB_H 1 | ||
| 9246 | #endif | ||
| 9247 | |||
| 9248 | static int jpeg_image_p P_ ((Lisp_Object object)); | 9247 | static int jpeg_image_p P_ ((Lisp_Object object)); |
| 9249 | static int jpeg_load P_ ((struct frame *f, struct image *img)); | 9248 | static int jpeg_load P_ ((struct frame *f, struct image *img)); |
| 9250 | 9249 | ||