summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-07-16 16:03:51 +0000
committerrsc <rsc>2006-07-16 16:03:51 +0000
commit8a7eb80e47546fab8decf3fdc1579cd8a137e406 (patch)
treee6d25804e17556d7b855436f42815bd3480bf691 /main.c
parentb75c11b20edad4e507d5bc2455177de59a38ec9f (diff)
downloadxv6-labs-8a7eb80e47546fab8decf3fdc1579cd8a137e406.tar.gz
xv6-labs-8a7eb80e47546fab8decf3fdc1579cd8a137e406.tar.bz2
xv6-labs-8a7eb80e47546fab8decf3fdc1579cd8a137e406.zip
fix main return type
Diffstat (limited to 'main.c')
-rw-r--r--main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/main.c b/main.c
index 3f2d57a..7606adc 100644
--- a/main.c
+++ b/main.c
@@ -18,8 +18,11 @@ extern uint8_t _binary_userfs_start[], _binary_userfs_size[];
extern int use_console_lock;
// CPU 0 starts running C code here.
-int
-main()
+// This is called main0 not main so that it can have
+// a void return type. Gcc can't handle functions named
+// main that don't return int. Really.
+void
+main0(void)
{
int i;
struct proc *p;
@@ -89,7 +92,7 @@ main()
}
// Additional processors start here.
-int
+void
mpmain(void)
{
cprintf("an application processor\n");