diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 16:26:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 19:27:59 +0000 |
| commit | 667c9c18973e00e530b25735707b2fa8c1602882 (patch) | |
| tree | 4123a988426efa13a23eeefe9aeedb4084cb5445 /bean | |
| parent | 3223c551c37c6b10b5b7de23ffa4520d720338b6 (diff) | |
Revert "Don't use the (win32) jawt_md.h as we don't have that when cross-compiling"
This reverts commit db57823374ee65b80cd53c5fd4234ad3bf6e287d, as it causes
loplugin:externandnotdefined under clang-cl, and cross-compiling Windows on
Linux seems a rather dead project for now.
Change-Id: Ia7fd742385fa0d609007f70e5116a99729224f77
Reviewed-on: https://gerrit.libreoffice.org/29835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 24 |
1 files changed, 1 insertions, 23 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 42f7714c2dca..300568d5814b 100644 --- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c +++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c @@ -25,32 +25,10 @@ #pragma warning(pop) #endif -#define JAWT_GetAWT hidden_JAWT_GetAWT -#include "jawt.h" -#undef JAWT_GetAWT - #if defined _MSC_VER #pragma warning(push, 1) #endif -/* When cross-compiling to Windows we don't have any Windows JDK - * available. Copying this short snippet from win32/jawt_md.h can - * surely not be against its license. The intent is to enable - * interoperation with real Oracle Java after all. We leave out the - * informative comments that might have "artistic merit" and be more - * copyrightable. Use this also for native Windows compilation for - * simplicity. - */ -typedef struct jawt_Win32DrawingSurfaceInfo { - union { - HWND hwnd; - HBITMAP hbitmap; - void* pbits; - }; - HDC hdc; - HPALETTE hpalette; -} JAWT_Win32DrawingSurfaceInfo; - -JNIIMPORT unsigned char JNICALL JAWT_GetAWT(JNIEnv *, JAWT *); +#include "jawt_md.h" #if defined _MSC_VER #pragma warning(pop) #endif |