aboutsummaryrefslogtreecommitdiff
path: root/example/multiple_files/foo.zig
diff options
context:
space:
mode:
authorJosh Wolfe <thejoshwolfe@gmail.com>2015-11-30 22:54:00 -0700
committerJosh Wolfe <thejoshwolfe@gmail.com>2015-11-30 22:54:00 -0700
commit9278dbedd5242bf4253da29c0fab36eea9dda61b (patch)
tree4bf997d327984a4772d7031de26949bc1b6e91c7 /example/multiple_files/foo.zig
parent18cfcfe44f4b4d624f20508210e2928396e3cf10 (diff)
parentcd68969115f19b09aeb72923426e722725ba9451 (diff)
downloadzig-9278dbedd5242bf4253da29c0fab36eea9dda61b.tar.gz
zig-9278dbedd5242bf4253da29c0fab36eea9dda61b.zip
Merge remote-tracking branch 'origin/master' into type-checking
Diffstat (limited to 'example/multiple_files/foo.zig')
-rw-r--r--example/multiple_files/foo.zig8
1 files changed, 7 insertions, 1 deletions
diff --git a/example/multiple_files/foo.zig b/example/multiple_files/foo.zig
index aacc49a556..a42e58397c 100644
--- a/example/multiple_files/foo.zig
+++ b/example/multiple_files/foo.zig
@@ -1,5 +1,11 @@
use "libc.zig";
-fn print_text() {
+// purposefully conflicting function with main.zig
+// but it's private so it should be OK
+fn private_function() {
puts("it works!");
}
+
+fn print_text() {
+ private_function();
+}