diff options
| author | Bastien Nocera <hadess@src.gnome.org> | 2002-02-10 21:22:11 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2002-02-10 21:22:11 +0000 |
| commit | d5efb48fccc903f02a785d93da64cd177e820ec7 (patch) | |
| tree | 87e989b0ea327eb53e93c492ef9262c60a524d9a | |
| parent | 760a2e34382a0ccfba6791c0d560b928804b1f3a (diff) | |
| download | nautilus-d5efb48fccc903f02a785d93da64cd177e820ec7.tar.gz | |
- disable jpeglib's reading of its config.h file, fixes HAVE_STDLIB double-definition
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-thumbnails-jpeg.c | 2 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2002-02-10 Bastien Nocera <hadess@hadess.net> + + * libnautilus-private/nautilus-thumbnails-jpeg.c: + disable jpeglib's reading of its config.h file + fixes HAVE_STDLIB double-definition + 2002-02-09 Darin Adler <darin@bentspoon.com> * NEWS: Bump version number. diff --git a/libnautilus-private/nautilus-thumbnails-jpeg.c b/libnautilus-private/nautilus-thumbnails-jpeg.c index 0afea9e90..4df7d8e24 100644 --- a/libnautilus-private/nautilus-thumbnails-jpeg.c +++ b/libnautilus-private/nautilus-thumbnails-jpeg.c @@ -32,6 +32,8 @@ #include <setjmp.h> #include <stdio.h> +/* Some versions of libjpeg seem to have jconfig.h in the public header */ +#define JCONFIG_INCLUDED #include <jpeglib.h> #include <libgnomevfs/gnome-vfs-types.h> |