Modified syscalls.* to fit CPP compilation

aethaniel · aethaniel · commit 65ce0cd0a2a1 · 2011-06-01T01:53:32.000+02:00
diff --git a/hardware/tools/libboard_sam3s-ek/include/syscalls.h b/hardware/tools/libboard_sam3s-ek/include/syscalls.h
@@ -37,8 +37,6 @@
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
-
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
@@ -47,10 +45,13 @@
 /*----------------------------------------------------------------------------
  *        Exported functions
  *----------------------------------------------------------------------------*/
+#ifdef __cplusplus
+ extern "C" {
+#endif
 
-extern caddr_t _sbrk ( int incr ) ;
+extern caddr_t _sbrk( int incr ) ;
 
-extern int link( char *old, char *new ) ;
+extern int link( char *cOld, char *cNew ) ;
 
 extern int _close( int file ) ;
 
@@ -63,3 +64,8 @@ extern int _lseek( int file, int ptr, int dir ) ;
 extern int _read(int file, char *ptr, int len) ;
 
 extern int _write( int file, char *ptr, int len ) ;
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/hardware/tools/libboard_sam3s-ek/source/syscalls.c b/hardware/tools/libboard_sam3s-ek/source/syscalls.c
@@ -77,7 +77,7 @@ extern caddr_t _sbrk ( int incr )
     return (caddr_t) prev_heap ;
 }
 
-extern int link( char *old, char *new )
+extern int link( char *cOld, char *cNew )
 {
     return -1 ;
 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ extern caddr_t _sbrk ( int incr )`
`77`	`77`	`return (caddr_t) prev_heap ;`
`78`	`78`	`}`
`79`	`79`
`80`		`-extern int link( char old, char new )`
	`80`	`+extern int link( char cOld, char cNew )`
`81`	`81`	`{`
`82`	`82`	`return -1 ;`
`83`	`83`	`}`