diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-05-20 21:37:39 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-12-03 02:20:16 +0100 |
| commit | 299bec7831111d5c141c1280cb7e8c51ee075c2b (patch) | |
| tree | 97dfab77c1b232a30bd1702847eaae201965a41b /external/pdfium/visibility.patch.1 | |
| parent | ba62bf4077789557079a7523226dc542a8773bbc (diff) | |
external: update pdfium to 3794
Reviewed-on: https://gerrit.libreoffice.org/72619
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 3dbe66b7895a412ad7ad9aede4be383489d805de)
Change-Id: Ie4c42943445813c7c50bf06cb710cedf2a61f3a9
Diffstat (limited to 'external/pdfium/visibility.patch.1')
| -rw-r--r-- | external/pdfium/visibility.patch.1 | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/external/pdfium/visibility.patch.1 b/external/pdfium/visibility.patch.1 index 04e89b38ab10..9983723b2055 100644 --- a/external/pdfium/visibility.patch.1 +++ b/external/pdfium/visibility.patch.1 @@ -1,26 +1,41 @@ diff --git a/public/fpdfview.h b/public/fpdfview.h -index 1ff0aeb26..f48036f2b 100644 +index f5212599f..57d6cda13 100644 --- a/public/fpdfview.h +++ b/public/fpdfview.h -@@ -129,14 +129,20 @@ typedef int FPDF_ANNOTATION_SUBTYPE; +@@ -154,31 +154,20 @@ typedef int FPDF_ANNOT_APPEARANCEMODE; // Dictionary value types. typedef int FPDF_OBJECT_TYPE; --#if defined(_WIN32) && defined(FPDFSDK_EXPORTS) --// On Windows system, functions are exported in a DLL +-#if defined(COMPONENT_BUILD) +-// FPDF_EXPORT should be consistent with |export| in the pdfium_fuzzer +-// template in testing/fuzzers/BUILD.gn. +-#if defined(WIN32) +-#if defined(FPDF_IMPLEMENTATION) +#if defined(PDFIUM_DLLIMPLEMENTATION) +#ifdef _WIN32 #define FPDF_EXPORT __declspec(dllexport) --#define FPDF_CALLCONV __stdcall #else +-#define FPDF_EXPORT __declspec(dllimport) +-#endif // defined(FPDF_IMPLEMENTATION) +-#else +-#if defined(FPDF_IMPLEMENTATION) +-#define FPDF_EXPORT __attribute__((visibility("default"))) +-#else -#define FPDF_EXPORT --#define FPDF_CALLCONV +-#endif // defined(FPDF_IMPLEMENTATION) +-#endif // defined(WIN32) +#define FPDF_EXPORT __attribute__ ((visibility("default"))) +#endif -+#else + #else +-#define FPDF_EXPORT +-#endif // defined(COMPONENT_BUILD) +- +-#if defined(WIN32) && defined(FPDFSDK_EXPORTS) +-#define FPDF_CALLCONV __stdcall +#ifdef _WIN32 +#define FPDF_EXPORT __declspec(dllimport) -+#else + #else +-#define FPDF_CALLCONV +#define FPDF_EXPORT __attribute__ ((visibility("default"))) #endif +#endif |