diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-07 13:43:22 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-07 16:26:59 +0200 |
| commit | abd89db2a9c1aee6f7a7f39374db7bc6d92e60c6 (patch) | |
| tree | 0489156c7ec47dfeeb6a1f2c4fc0bab5fb74df5b | |
| parent | 8e784b59f1c1ce33dc95a6c591ee514383b28f3f (diff) | |
Fix bean linking on wntgccx
Change-Id: I8d5d62be630f85e9a807dc108baca8be2930224e
| -rw-r--r-- | bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 5 | ||||
| -rw-r--r-- | external/CustomTarget_jawt.mk | 7 | ||||
| -rw-r--r-- | include/wntgccx/jni_md.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c index b4e7d82921c9..c666f8a73a5f 100644 --- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -25,7 +25,6 @@ #pragma warning(pop) #endif -#include <windows.h> #define JAWT_GetAWT hidden_JAWT_GetAWT #include "jawt.h" #undef JAWT_GetAWT @@ -51,7 +50,7 @@ typedef struct jawt_Win32DrawingSurfaceInfo { HPALETTE hpalette; } JAWT_Win32DrawingSurfaceInfo; -extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT *); +JNIIMPORT unsigned char JNICALL JAWT_GetAWT(JNIEnv *, JAWT *); #if defined _MSC_VER #pragma warning(pop) #endif @@ -157,7 +156,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr ); } - return ((jlong)(LONG)hWnd); + return ((jlong)hWnd); } diff --git a/external/CustomTarget_jawt.mk b/external/CustomTarget_jawt.mk index ac3ef628bea5..2d35d93a24c2 100644 --- a/external/CustomTarget_jawt.mk +++ b/external/CustomTarget_jawt.mk @@ -14,10 +14,17 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\ libjawt.dll.a \ )) +ifeq ($(OS)$(CPU),WNTX) +$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo EXPORTS > $@ + echo "JAWT_GetAWT" >> $@ +else $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo EXPORTS > $@ echo "JAWT_GetAWT@8" >> $@ +endif $(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) diff --git a/include/wntgccx/jni_md.h b/include/wntgccx/jni_md.h index e77438d75e6b..4d80f3878a6c 100644 --- a/include/wntgccx/jni_md.h +++ b/include/wntgccx/jni_md.h @@ -24,7 +24,7 @@ #define JNIEXPORT __declspec (dllexport) #define JNIIMPORT __declspec (dllimport) -#define JNICALL __stdcall +#define JNICALL typedef long jint; typedef __int64 jlong; |