Hi all,
the proposed workaround (which I needed to get the library
source code built with a MinGW-w64 cross-compiler from GNU/Linux)
is attached, please review it and if accepted, please apply it
(separately) to the public repository, otherwise please tell me
why not.
Best regards, mabri
Index: src/base/PdfFiltersPrivate.h
===================================================================
--- src/base/PdfFiltersPrivate.h (revision 1690)
+++ src/base/PdfFiltersPrivate.h (working copy)
@@ -53,11 +62,13 @@
#ifdef PODOFO_HAVE_JPEG_LIB
extern "C" {
-#ifdef _WIN32 // Collision between win and jpeg-headers
+#ifdef _WIN32 // Collision between Win32 and libjpeg headers
#define XMD_H
#undef FAR
+#define boolean jpeg_bool
#endif
#include "jpeglib.h"
+// #undef boolean // still needed, please feel free to offer a better solution
}
#endif // PODOFO_HAVE_JPEG_LIB
Index: src/base/PdfDefinesPrivate.h
===================================================================
--- src/base/PdfDefinesPrivate.h (revision 1690)
+++ src/base/PdfDefinesPrivate.h (working copy)
@@ -5,8 +5,10 @@
#error PdfDefinesPrivate.h is only available for use in the core PoDoFo src/ build .cpp files
#endif
-// Right now, just pulls in the private parts of the compiler compat hacks.
+// Right now, just pulls in the private parts of the compiler compat hacks ...
#include "PdfCompilerCompatPrivate.h"
+// ... and also a collision-prevention measure (for libjpeg)
+#define boolean jpeg_bool
/**
* \page <PoDoFo PdfDefinesPrivate Header>
------------------------------------------------------------------------------
_______________________________________________
Podofo-users mailing list
Podofo-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/podofo-users
