diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-01-17 14:08:57 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-01-17 14:08:57 +0100 |
| commit | 3774a0b0a9d508de4d37d9c32ffd8b82bd7f5719 (patch) | |
| tree | 5b7cc8e7461a81f00e568cade95182697e061524 | |
| parent | 3088a69c6e5a47cd85957f8ac5894f27297f09de (diff) | |
Update bundled libjpeg to version 9e - cont'd
| -rw-r--r-- | README.bundled-libs.txt | 2 | ||||
| -rw-r--r-- | jpeg/jconfig.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/README.bundled-libs.txt b/README.bundled-libs.txt index 9fded5db5..8f84d0f39 100644 --- a/README.bundled-libs.txt +++ b/README.bundled-libs.txt @@ -230,6 +230,8 @@ jpeg: Makefile: Same as CMakeLists.txt. fltk_jpeg_prefix.h: Generate on a Linux system and merge (see above). + + jconfig.h: keep changes flagged with /* FLTK */ Note: more to come... diff --git a/jpeg/jconfig.h b/jpeg/jconfig.h index 340eb91e5..a73242fbd 100644 --- a/jpeg/jconfig.h +++ b/jpeg/jconfig.h @@ -16,9 +16,9 @@ /* #undef void */ /* #undef const */ /* #undef CHAR_IS_UNSIGNED */ -#define HAVE_STDDEF_H 1 +/* #define HAVE_STDDEF_H 1 */ /* FLTK */ #define HAVE_STDLIB_H 1 -#define HAVE_LOCALE_H 1 +/* #define HAVE_LOCALE_H 1 */ /* FLTK */ /* #undef NEED_BSD_STRINGS */ /* #undef NEED_SYS_TYPES_H */ /* #undef NEED_FAR_POINTERS */ @@ -43,7 +43,7 @@ typedef unsigned char boolean; #ifdef JPEG_INTERNALS /* #undef RIGHT_SHIFT_IS_UNSIGNED */ -#define INLINE __inline__ +/* #define INLINE __inline__ */ /* FLTK */ /* These are for configuring the JPEG memory manager. */ /* #undef DEFAULT_MAX_MEM */ /* #undef NO_MKTEMP */ |