--- old/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h	2018-03-23 14:24:36.625157880 +0100
+++ new/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h	2018-03-23 14:24:36.421157881 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include <mlib_types.h>
 #include <mlib_status.h>
 #include <mlib_image_types.h>
+#include "jni.h"
 #if defined ( __MEDIALIB_OLD_NAMES_ADDED )
 #include <../include/mlib_image_proto.h>
 #endif /* defined ( __MEDIALIB_OLD_NAMES_ADDED ) */
@@ -43,12 +44,6 @@
 #endif // __USE_J2D_NAMES
 
 #if defined ( _MSC_VER )
-#define J2D_MLIB_PUBLIC __declspec(dllexport)
-#else
-#define J2D_MLIB_PUBLIC
-#endif /* _MSC_VER */
-
-#if defined ( _MSC_VER )
 #if ! defined ( __MEDIALIB_OLD_NAMES )
 #define __MEDIALIB_OLD_NAMES
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
@@ -1059,23 +1054,23 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageCreate mlib_ImageCreate
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_image * __mlib_ImageCreate(mlib_type type,
-                                mlib_s32 channels,
-                                mlib_s32 width,
-                                mlib_s32 height);
+JNIEXPORT mlib_image * JNICALL
+__mlib_ImageCreate(mlib_type type,
+                   mlib_s32 channels,
+                   mlib_s32 width,
+                   mlib_s32 height);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageCreateStruct mlib_ImageCreateStruct
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_image * __mlib_ImageCreateStruct(mlib_type type,
-                                      mlib_s32 channels,
-                                      mlib_s32 width,
-                                      mlib_s32 height,
-                                      mlib_s32 stride,
-                                      const void *data);
+JNIEXPORT mlib_image * JNICALL
+__mlib_ImageCreateStruct(mlib_type type,
+                         mlib_s32 channels,
+                         mlib_s32 width,
+                         mlib_s32 height,
+                         mlib_s32 stride,
+                         const void *data);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
@@ -1091,8 +1086,8 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageDelete mlib_ImageDelete
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-void  __mlib_ImageDelete(mlib_image *img);
+JNIEXPORT void JNICALL
+__mlib_ImageDelete(mlib_image *img);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
@@ -1421,12 +1416,12 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageAffine mlib_ImageAffine
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageAffine(mlib_image *dst,
-                                const mlib_image *src,
-                                const mlib_d64 *mtx,
-                                mlib_filter filter,
-                                mlib_edge edge);
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageAffine(mlib_image *dst,
+                   const mlib_image *src,
+                   const mlib_d64 *mtx,
+                   mlib_filter filter,
+                   mlib_edge edge);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
@@ -2302,10 +2297,10 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageLookUp mlib_ImageLookUp
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageLookUp(mlib_image *dst,
-                                const mlib_image *src,
-                                const void **table);
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageLookUp(mlib_image *dst,
+                   const mlib_image *src,
+                   const void **table);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
@@ -2631,29 +2626,29 @@
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvKernelConvert mlib_ImageConvKernelConvert
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
-                                           mlib_s32 *iscale,
-                                           const mlib_d64 *fkernel,
-                                           mlib_s32 m,
-                                           mlib_s32 n,
-                                           mlib_type type);
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageConvKernelConvert(mlib_s32 *ikernel,
+                              mlib_s32 *iscale,
+                              const mlib_d64 *fkernel,
+                              mlib_s32 m,
+                              mlib_s32 n,
+                              mlib_type type);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )
 #define __mlib_ImageConvMxN mlib_ImageConvMxN
 #endif /* ! defined ( __MEDIALIB_OLD_NAMES ) */
-J2D_MLIB_PUBLIC
-mlib_status  __mlib_ImageConvMxN(mlib_image *dst,
-                                 const mlib_image *src,
-                                 const mlib_s32 *kernel,
-                                 mlib_s32 m,
-                                 mlib_s32 n,
-                                 mlib_s32 dm,
-                                 mlib_s32 dn,
-                                 mlib_s32 scale,
-                                 mlib_s32 cmask,
-                                 mlib_edge edge);
+JNIEXPORT mlib_status JNICALL
+__mlib_ImageConvMxN(mlib_image *dst,
+                    const mlib_image *src,
+                    const mlib_s32 *kernel,
+                    mlib_s32 m,
+                    mlib_s32 n,
+                    mlib_s32 dm,
+                    mlib_s32 dn,
+                    mlib_s32 scale,
+                    mlib_s32 cmask,
+                    mlib_edge edge);
 
 
 #if defined ( __MEDIALIB_OLD_NAMES )