From 4275a6cc61bb83038bd3e74a27e05a78a8cc576f Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Thu, 2 Aug 2018 01:32:55 -0400
Subject: [PATCH] Fix build on Windows.

---
 lib/bin/build_libsodium-windows           | 9 +++++++++
 platform-independent/c/core/build.gradle  | 4 ++--
 platform-independent/c/core/src/mpw-jni.c | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/bin/build_libsodium-windows b/lib/bin/build_libsodium-windows
index 4f3a51b1..5b2ca79b 100644
--- a/lib/bin/build_libsodium-windows
+++ b/lib/bin/build_libsodium-windows
@@ -1,4 +1,13 @@
 #!/usr/bin/env bash
 source "${BASH_SOURCE%/*}/build_lib"
 
+finalize_merge() {
+    local prefix=$1 platform=$2; shift 2
+    local archs=( "$@" )
+
+    cp -a "src/libsodium/include" "$prefix/out"
+    
+    _finalize_merge "$prefix" "$platform" "${archs[@]}"
+}
+
 build libsodium windows
diff --git a/platform-independent/c/core/build.gradle b/platform-independent/c/core/build.gradle
index d9b2e73a..54fc8478 100644
--- a/platform-independent/c/core/build.gradle
+++ b/platform-independent/c/core/build.gradle
@@ -69,14 +69,14 @@ library {
                 }
 
                 // libjson-c
-                archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
+                /*archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
                     commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}"
                     privateHeaders.from "$rootDir/../lib/libjson-c/build-${system}~/out/include"
                     add( linkLibraries.name, fileTree( "$rootDir/../lib/libjson-c/build-${system}~/out/lib" ) )
                 }
                 clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
                     commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}", 'clean'
-                }
+                }*/
             }
         }
     }
diff --git a/platform-independent/c/core/src/mpw-jni.c b/platform-independent/c/core/src/mpw-jni.c
index a927cdd0..33a72f73 100644
--- a/platform-independent/c/core/src/mpw-jni.c
+++ b/platform-independent/c/core/src/mpw-jni.c
@@ -7,7 +7,7 @@
 
 // TODO: We may need to zero the jbytes safely.
 
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
     JNIEnv* env;
     if ((*vm)->GetEnv( vm, (void **)&env, JNI_VERSION_1_6 ) != JNI_OK)
         return -1;