Skip to content

Commit

Permalink
Merge pull request #1101 from matthiasblaesing/github-1097
Browse files Browse the repository at this point in the history
Allow `.ocx` as extension of native libraries on windows
  • Loading branch information
matthiasblaesing authored Jun 2, 2019
2 parents b8bdacb + d045a9b commit 2efd065
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------
Expand Down
2 changes: 1 addition & 1 deletion src/com/sun/jna/NativeLibrary.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 2efd065

Please sign in to comment.