diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-02-02 16:52:07 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-02-02 16:52:07 -0800 |
| commit | ef4dce44bb4b990f301a98853075f501c6f053d7 (patch) | |
| tree | 006cd513695df7d324fce1fd1b4a58af3902d799 /core/src/fxcodec | |
| parent | 3795a748bb3fb7fc3f2c6196af1f89627ac37f4e (diff) | |
| download | pdfium-ef4dce44bb4b990f301a98853075f501c6f053d7.tar.xz | |
Merge the following changes to XFA branch:
b3a788e Fix GN PDFium build when building all. by John Abd-El-Malek - 19 hours ago chromium/2293
f8af677 Always use the FreeType headers included in PDFium. by John Abd-El-Malek - 24 hours ago
dc8c950 Don't export any OpenJPEG methods from PDFium. by John Abd-El-Malek - 3 days ago
71c24b8 Use system FreeType on Linux. by John Abd-El-Malek - 3 days ago
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/900433002
Diffstat (limited to 'core/src/fxcodec')
| -rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.h b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.h index 988db72009..b1e1c294c8 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.h +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.h @@ -76,32 +76,10 @@ Most compilers implement their own version of this keyword ... #define OPJ_DEPRECATED(func) func #endif -#if defined(OPJ_STATIC) || !defined(_WIN32) -/* http://gcc.gnu.org/wiki/Visibility */ -#if __GNUC__ >= 4 -#define OPJ_API __attribute__ ((visibility ("default"))) -#define OPJ_LOCAL __attribute__ ((visibility ("hidden"))) -#else +// PDFium doesn't need to export any of these methods. #define OPJ_API #define OPJ_LOCAL -#endif #define OPJ_CALLCONV -#else -#define OPJ_CALLCONV __stdcall -/* -The following ifdef block is the standard way of creating macros which make exporting -from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS -symbol defined on the command line. this symbol should not be defined on any project -that uses this DLL. This way any other project whose source files include this file see -OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols -defined with this macro as being exported. -*/ -#if defined(OPJ_EXPORTS) || defined(DLL_EXPORT) -#define OPJ_API __declspec(dllexport) -#else -#define OPJ_API __declspec(dllimport) -#endif /* OPJ_EXPORTS */ -#endif /* !OPJ_STATIC || !_WIN32 */ typedef int OPJ_BOOL; #define OPJ_TRUE 1 |