--- old/src/java.base/share/native/libjli/splashscreen_stubs.c 2015-02-19 16:42:28.596204572 +0300 +++ new/src/java.base/share/native/libjli/splashscreen_stubs.c 2015-02-19 16:42:28.302197084 +0300 @@ -24,6 +24,12 @@ */ #include +#ifdef __WINDOWS__ +# include +#else +# include +#endif + #include "splashscreen.h" extern void* SplashProcAddress(const char* name); /* in java_md.c */ @@ -57,7 +63,8 @@ if (!proc) { return def; } \ ret ((name##_t)proc) -#define INVOKE(name,def) _INVOKE(name,def,return) +#define INVOKE(name,def) _INVOKE(name,((intptr_t) def),return) +#define INVOKEP(name,def) _INVOKE(name,def,return) #define INVOKEV(name) _INVOKE(name, ,;) int DoSplashLoadMemory(void* pdata, int size) { @@ -86,5 +93,6 @@ char* DoSplashGetScaledImageName(const char* fileName, const char* jarName, float* scaleFactor) { - INVOKE(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor); -} \ No newline at end of file + INVOKEP(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor); +} +