Merge branch 'maint-1.6.0' into maint

[git] / t / t4109 / patch4.patch

diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
@@ -1,13 +1,14 @@
 #include <stdio.h>
 
 int func(int num);
-void print_int(int num);
+int func2(int num);
 
 int main() {
        int i;
 
        for (i = 0; i < 10; i++) {
-               print_int(func(i));
+               printf("%d", func(i));
+               printf("%d", func3(i));
        }
 
        return 0;
@@ -17,7 +18,7 @@
        return num * num;
 }
 
-void print_int(int num) {
-       printf("%d", num);
+int func2(int num) {
+       return num * num * num;
 }