Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
93aa5c81
Commit
93aa5c81
authored
Oct 08, 2012
by
Daniel Colascione
Browse files
Improve fix for jpeglib build break
parent
5c0255d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
10 deletions
+20
-10
src/ChangeLog
src/ChangeLog
+5
-0
src/image.c
src/image.c
+15
-10
No files found.
src/ChangeLog
View file @
93aa5c81
2012-10-08 Daniel Colascione <dancol@dancol.org>
* image.c: Permanent fix for JPEG compilation issue --- limit
jpeglib `boolean' redefinition to Cygwin builds.
2012-10-08 Eli Zaretskii <eliz@gnu.org>
* image.c (CHECK_LIB_AVAILABLE): Remove, no longer used.
...
...
src/image.c
View file @
93aa5c81
...
...
@@ -6061,21 +6061,26 @@ jpeg_image_p (Lisp_Object object)
#define __WIN32__ 1
#endif
#if 0 /* FIXME */
/* Work around conflict between jpeg boolean and rpcndr.h
under Windows. */
/* rpcndr.h (via windows.h) and jpeglib.h both define boolean types.
Some versions of jpeglib try to detect whether rpcndr.h is loaded,
using the Windows boolean type instead of the jpeglib boolean type
if so. Cygwin jpeglib, however, doesn't try to detect whether its
headers are included along with windows.h, so under Cygwin, jpeglib
attempts to define a conflicting boolean type. Worse, forcing
Cygwin jpeglib headers to use the Windows boolean type doesn't work
because it created an ABI incompatibility between the
already-compiled jpeg library and the header interface definition.
The best we can do is to define jpeglib's boolean type to a
different name. This name, jpeg_boolean, remains in effect through
the rest of image.c.
*/
#if defined (CYGWIN) && defined (HAVE_NTGUI)
#define boolean jpeg_boolean
#endif
#include <jpeglib.h>
#include <jerror.h>
/* Don't undefine boolean --- use the JPEG boolean
through the rest of the file. */
#ifdef HAVE_STLIB_H_1
#define HAVE_STDLIB_H 1
#endif
#ifdef WINDOWSNT
/* JPEG library details. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment