97d8b88221
Also revert my two minor follow-up popper commits. Poppler doesn't build on Mac OS X. It uses fontconfig, and we don't depend on that on the Mac. There is a patch from 2009 http://lists.freedesktop.org/archives/poppler/2009-July/004932.html (actual patch at http://lists.freedesktop.org/archives/poppler/attachments/20090712/f3b154d0/attachment-0001.obj ) that makes poppler not use fontconfig on the Mac, but it was never upstreamed. And that patch uses the obsolete ATSUI API, which we want to stop using in LO code, not introduce new uses of. This reverts commit39f9eb0d85. This reverts commit0941c21185. This reverts commita6e9bb4c7b.
21 lines
732 B
Diff
21 lines
732 B
Diff
--- misc/xpdf-3.02/xpdf/Error.h.sav 2007-02-27 23:05:52.000000000 +0100
|
|
+++ misc/build/xpdf-3.02/xpdf/Error.h 2012-10-09 23:24:12.002455791 +0200
|
|
@@ -18,6 +18,6 @@
|
|
#include <stdio.h>
|
|
#include "config.h"
|
|
|
|
-extern void CDECL error(int pos, char *msg, ...);
|
|
+extern void CDECL error(int pos, const char *msg, ...);
|
|
|
|
#endif
|
|
--- misc/build/xpdf-3.02/xpdf/Error.cc.sav 2007-02-27 23:05:52.000000000 +0100
|
|
+++ misc/build/xpdf-3.02/xpdf/Error.cc 2012-10-09 23:24:27.813569809 +0200
|
|
@@ -18,7 +18,7 @@
|
|
#include "GlobalParams.h"
|
|
#include "Error.h"
|
|
|
|
-void CDECL error(int pos, char *msg, ...) {
|
|
+void CDECL error(int pos, const char *msg, ...) {
|
|
va_list args;
|
|
|
|
// NB: this can be called before the globalParams object is created
|