Merge pull request #1101 from matthiasblaesing/github-1097

Allow `.ocx` as extension of native libraries on windows
java-native-access · Jun 2, 2019 · 2efd065 · 2efd065
2 parents b8bdacb + d045a9b
commit 2efd065
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,7 @@ Next release (5.4.0)
 
 Features
 --------
+* [#1097](https://github.com/java-native-access/jna/issues/1097): Allow `.ocx` as extension of native libraries on windows - [@dmigowski](https://github.com/dmigowski).
 
 Bug Fixes
 ---------

diff --git a/src/com/sun/jna/NativeLibrary.java b/src/com/sun/jna/NativeLibrary.java
@@ -776,7 +776,7 @@ else if (Platform.isAIX()) {    // can be libx.a, libx.a(shr.o), libx.so
             }
         }
         else if (Platform.isWindows()) {
-            if (libName.endsWith(".drv") || libName.endsWith(".dll")) {
+            if (libName.endsWith(".drv") || libName.endsWith(".dll") || libName.endsWith(".ocx")) {
                 return libName;
             }
         }