Skip to content

Commit 39cf110

Browse files
authored
Change header file naming to match methods (#58)
1 parent d655cb5 commit 39cf110

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

plugin/src/main/java/com/github/sbt/jni/javah/util/Utils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ public static String mangleName(String name) {
5353
char ch = name.charAt(i);
5454
if (ch == '.') {
5555
builder.append('_');
56-
} else if (ch == '$') {
57-
builder.append("__");
5856
} else if (ch == '_') {
5957
builder.append("_1");
6058
} else if (ch == ';') {

plugin/src/sbt-test/sbt-jni/multiclasses/native1/src/library.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <jni.h>
22
#include "multiclasses_Adder.h"
3-
#include "multiclasses_Adder__.h"
3+
#include "multiclasses_Adder_00024.h"
44

55
/*
66
* Class: multiclasses_Adder
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
> +javah
2-
$ exists src/native/include/simple_Library__.h
2+
$ exists src/native/include/simple_Library_00024.h
33
> nativeInit cmake demo
44
> +run
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
> +javah
2-
$ exists native/src/include/simple_Library__.h
2+
$ exists native/src/include/simple_Library_00024.h
33
> nativeInit cmake demo
44
> +test
55
> +core/run

plugin/src/sbt-test/sbt-jni/simple/native/src/library.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <stdio.h>
2-
#include "simple_Library__.h"
2+
#include "simple_Library_00024.h"
33

44
/*
55
* Class: simple_Library__
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
> +javah
2-
$ exists native/src/include/simple_Library__.h
2+
$ exists native/src/include/simple_Library_00024.h
33
> nativeInit cmake demo
44
> +test
55
> +core/run

0 commit comments

Comments
 (0)