summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-08 12:46:58 -0600
committerGitHub <noreply@github.com>2016-11-08 12:46:58 -0600
commit7fe40e0cf92df36219308406dcb4130a848fb6f6 (patch)
treec4821254c6d15cacda8fb9a83721e272b5885d6e /tests
parent108c4ca68769e7acad2a503001a156e0c51a7a8b (diff)
parent6645bbc660ad573da8edee574b1cdae9a92691dc (diff)
Auto merge of #229 - emilio:core-functions, r=fitzgen
Fix --use-core for functions, since we used the aster helper. r? @fitzgen, @nox or anyone else?
Diffstat (limited to 'tests')
-rw-r--r--tests/expectations/tests/use-core.rs2
-rw-r--r--tests/headers/use-core.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/expectations/tests/use-core.rs b/tests/expectations/tests/use-core.rs
index 484105ea..b0900f5f 100644
--- a/tests/expectations/tests/use-core.rs
+++ b/tests/expectations/tests/use-core.rs
@@ -20,3 +20,5 @@ fn bindgen_test_layout_foo() {
impl Clone for foo {
fn clone(&self) -> Self { *self }
}
+pub type fooFunction =
+ ::core::option::Option<unsafe extern "C" fn(bar: ::std::os::raw::c_int)>;
diff --git a/tests/headers/use-core.h b/tests/headers/use-core.h
index 535d2b15..42bb10d9 100644
--- a/tests/headers/use-core.h
+++ b/tests/headers/use-core.h
@@ -4,3 +4,5 @@ struct foo {
int a, b;
void* bar;
};
+
+typedef void (*fooFunction)(int bar);