7f50b9ab81
* Remove obsolete cmake build options BUILD_MJ2, BUILD_JPWL and BUILD_JP3D. * Remove upstream 0001-fix-install-for-dlls.all.patch file. commit07ef7d750bcommit23f5eeec20* Remove 0007-workaround-jp3d-opj_free-link.patch file as jp3d is removed. * Remove upstrem 0008-cmake-add-install-interface-include-directory.patch file. commit5c2053950e* Remove hunks for openjp3d, openmj2 and openjpwl directories.
26 lines
668 B
Diff
26 lines
668 B
Diff
--- a/src/lib/openjp2/openjpeg.h
|
|
+++ b/src/lib/openjp2/openjpeg.h
|
|
@@ -76,6 +76,12 @@
|
|
#define OPJ_DEPRECATED(func) func
|
|
#endif
|
|
|
|
+#if defined(_ARM_)
|
|
+#define OPJ_CALLCONV
|
|
+#else
|
|
+#define OPJ_CALLCONV __stdcall
|
|
+#endif
|
|
+
|
|
#if defined(OPJ_STATIC) || !defined(_WIN32)
|
|
/* http://gcc.gnu.org/wiki/Visibility */
|
|
# if !defined(_WIN32) && __GNUC__ >= 4
|
|
@@ -89,9 +95,7 @@
|
|
# 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
|