Fix bean linking on wntgccx

Change-Id: I8d5d62be630f85e9a807dc108baca8be2930224e

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);
 }
 
 

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)

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;