summaryrefslogtreecommitdiff
path: root/bean/native
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-06-07 13:43:22 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-06-07 16:26:59 +0200
commitabd89db2a9c1aee6f7a7f39374db7bc6d92e60c6 (patch)
tree0489156c7ec47dfeeb6a1f2c4fc0bab5fb74df5b /bean/native
parent8e784b59f1c1ce33dc95a6c591ee514383b28f3f (diff)
Fix bean linking on wntgccx
Change-Id: I8d5d62be630f85e9a807dc108baca8be2930224e
Diffstat (limited to 'bean/native')
-rw-r--r--bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c5
1 files changed, 2 insertions, 3 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);
}