Merge pull request #43 from spicyjpeg/cmake

Even more CMake fixes, submodules, pads example

1 files changed, 9 insertions, 19 deletions

diff --git a/libpsn00b/include/stdlib.h b/libpsn00b/include/stdlib.h
index 474eba6..de3ab47 100644
--- a/libpsn00b/include/stdlib.h
+++ b/libpsn00b/include/stdlib.h
@@ -19,34 +19,16 @@ extern long atol(char *s);
 extern char atob(char *s); // Is this right?
 */
 
-// Random number functions (not yet implemented)
-
-/*
-int rand();
-void srand(unsigned int seed);
-*/
-
 // Quick sort (not yet implemented)
 
 //void qsort(void *base , int nel , int width , int (*cmp)(const void *,const void *));
 
-// Memory allocation functions (not yet implemented, avoid using BIOS as they are reportedly buggy)
-
-/*
-#warning "malloc() family of functions NEEDS MORE TESTING"
-
-void *malloc(int size);
-void free(void *buf);
-void *calloc(int number, int size);
-void *realloc(void *buf , int n);
-*/
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 extern int __argc;
-extern char __argv[];
+extern const char **__argv;
 
 int rand();
 void srand(unsigned long seed);
@@ -64,6 +46,14 @@ long atol(const char *s);
 double strtod(const char *nptr, char **endptr);
 float strtof(const char *nptr, char **endptr);
 
+// Memory allocation functions
+unsigned int *GetBSSend();
+void InitHeap(unsigned int *addr, int size);
+int SetHeapSize(int size);
+void *malloc(int size);
+void *calloc(int number, int size);
+void free(void *ptr);
+
 #ifdef __cplusplus
 }
 #endif