diff options
| author | Gerd Moellmann | 1999-08-24 19:25:06 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-08-24 19:25:06 +0000 |
| commit | ba06aba44f276378c44a0e17de6ad62dd4748df6 (patch) | |
| tree | 6971e1e8a1b95a64b2ed4d151ea54fde1554a341 /src | |
| parent | e536f7a0a8af33b1f293085ec5854d52dea6e0b6 (diff) | |
| download | emacs-ba06aba44f276378c44a0e17de6ad62dd4748df6.tar.gz emacs-ba06aba44f276378c44a0e17de6ad62dd4748df6.zip | |
[HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
being redefined in jconfig.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 11 |
1 files changed, 11 insertions, 0 deletions
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) | |||
| 8257 | 8257 | ||
| 8258 | #if HAVE_JPEG | 8258 | #if HAVE_JPEG |
| 8259 | 8259 | ||
| 8260 | /* Work around a warning about HAVE_STDLIB_H being redefined in | ||
| 8261 | jconfig.h. */ | ||
| 8262 | #ifdef HAVE_STDLIB_H | ||
| 8263 | #define HAVE_STDLIB_H_1 | ||
| 8264 | #undef HAVE_STDLIB_H | ||
| 8265 | #endif /* HAVE_STLIB_H */ | ||
| 8266 | |||
| 8260 | #include <jpeglib.h> | 8267 | #include <jpeglib.h> |
| 8261 | #include <jerror.h> | 8268 | #include <jerror.h> |
| 8262 | #include <setjmp.h> | 8269 | #include <setjmp.h> |
| 8263 | 8270 | ||
| 8271 | #ifdef HAVE_STLIB_H_1 | ||
| 8272 | #define HAVE_STDLIB_H 1 | ||
| 8273 | #endif | ||
| 8274 | |||
| 8264 | static int jpeg_image_p P_ ((Lisp_Object object)); | 8275 | static int jpeg_image_p P_ ((Lisp_Object object)); |
| 8265 | static int jpeg_load P_ ((struct frame *f, struct image *img)); | 8276 | static int jpeg_load P_ ((struct frame *f, struct image *img)); |
| 8266 | 8277 | ||