Kaydet (Commit) 667c9c18 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "Don't use the (win32) jawt_md.h as we don't have that when cross-compiling"

This reverts commit db578233, 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/29835Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 3223c551
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment