From 54d72f8284703a404b5a9180cb6841c42473d5c6 Mon Sep 17 00:00:00 2001 From: A Pottinger Date: Sun, 20 Oct 2019 17:00:05 -0700 Subject: [PATCH] Migrate to JNA 5 compatiable Native.load. Related to https://github.com/processing/processing4/issues/7, move from loadLibrary to interface compatible load per https://github.com/java-native-access/jna/blob/master/www/GettingStarted.md (see https://github.com/java-native-access/jna/commit/00d6b1387c198a785e05c0a94dc7cdb4e4df0bb1). --- app/src/processing/app/platform/DefaultPlatform.java | 2 +- app/src/processing/app/platform/WindowsPlatform.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/platform/DefaultPlatform.java b/app/src/processing/app/platform/DefaultPlatform.java index 9cee2cbc4..ac11db87f 100644 --- a/app/src/processing/app/platform/DefaultPlatform.java +++ b/app/src/processing/app/platform/DefaultPlatform.java @@ -129,7 +129,7 @@ public class DefaultPlatform { public interface CLibrary extends Library { - CLibrary INSTANCE = Native.loadLibrary("c", CLibrary.class); + CLibrary INSTANCE = Native.load("c", CLibrary.class); int setenv(String name, String value, int overwrite); String getenv(String name); int unsetenv(String name); diff --git a/app/src/processing/app/platform/WindowsPlatform.java b/app/src/processing/app/platform/WindowsPlatform.java index 58e01747c..25cbf2468 100644 --- a/app/src/processing/app/platform/WindowsPlatform.java +++ b/app/src/processing/app/platform/WindowsPlatform.java @@ -560,7 +560,7 @@ public class WindowsPlatform extends DefaultPlatform { static WinLibC getLibC() { if (clib == null) { try { - clib = Native.loadLibrary("msvcrt", WinLibC.class); + clib = Native.load("msvcrt", WinLibC.class); } catch (UnsatisfiedLinkError ule) { Messages.showTrace("JNA Error", "JNA could not be loaded. Please report here:\n" +