Merge branch 'lwip_dev' into devel

[palacios.git] / geekos / include / lwip / arch / cc.h

diff --git a/geekos/include/lwip/arch/cc.h b/geekos/include/lwip/arch/cc.h
index 73eb7d3..75b51bd 100644 (file)
--- a/geekos/include/lwip/arch/cc.h
+++ b/geekos/include/lwip/arch/cc.h
@@ -35,11 +35,7 @@
 /* Include some files for defining library routines */
 
 #include <string.h>
-
-extern int fflush(FILE *file);
-extern int printf(char *fmt, ...);
-extern void abort (void);
-
+#include <geekos/debug.h>
 
 /* Define platform endianness */
 #ifndef BYTE_ORDER
@@ -74,7 +70,7 @@ typedef u32_t mem_ptr_t;
 //#include <stdio.h>
 //#include <stdlib.h>
 /* Plaform specific diagnostic output */
-#define LWIP_PLATFORM_DIAG(x)  //do {printf x;} while(0)
+#define LWIP_PLATFORM_DIAG(x)  do {PrintBoth x;} while(0)//do {printf x;} while(0)
 
 #define LWIP_PLATFORM_ASSERT(x)   do {printf("Assertion \"%s\" failed at line %d in %s\n", \
                                    x, __LINE__, __FILE__); fflush(NULL); abort();} while(0)