mescc: Support regular C99 compile, headers + mlibc.

[mes.git] / scaffold / cons-mes.c

diff --git a/scaffold/cons-mes.c b/scaffold/cons-mes.c
index 7e4784c6d9279a36d5b459e678488fcd0e9a7743..093db77e2931d190935611a704e8c6b1540cb55d 100644 (file)
--- a/scaffold/cons-mes.c
+++ b/scaffold/cons-mes.c
@@ -22,15 +22,11 @@
 #error "POSIX not supported"
 #endif
 
 #error "POSIX not supported"
 #endif
 

-#if  __MESC__
-char **g_environment;
-int g_stdin = 0;
-#define assert(x) ((x) ? (void)0 : assert_fail (#x))
-#endif
-
-#if !__MESC__
-#include "mlibc.c"
-#endif
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mlibc.h>

 
 char arena[2000];
 
 
 char arena[2000];
 


@@ -878,7 +874,3 @@ main (int argc, char *argv[])
   return 0;
 }
 
   return 0;
 }
 

-#if !__MESC__
-#include "mstart.c"
-#endif
-