Merge remote-tracking branch 'remotes/origin/microbuilder-fixes'

2011-05-21 01:22:04 +02:00 · 2011-05-21 01:22:04 +02:00 · 3f3d18b1bb
parent 76e3cf789f 1cc2fd1384
commit 3f3d18b1bb
1 changed files with 1 additions and 1 deletions
--- a/lpc1xxx/LPC1xxx_startup.c
+++ b/lpc1xxx/LPC1xxx_startup.c
@ -36,7 +36,7 @@ extern unsigned char _bss;
 extern unsigned char _ebss;

 // Prototype the required startup functions
-extern void main(void);
+extern int main(void);

 // The entry point of the application, prepare segments,
 // initialize the cpu and execute main()