From 5bbdcb863320b7fd09abb040543c390e2f0d22c2 Mon Sep 17 00:00:00 2001 From: Wang Renxin Date: Thu, 29 Oct 2015 10:15:09 +0800 Subject: [PATCH] *improved compile compatibility with c++. --- shell/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/shell/main.c b/shell/main.c index c97cb9e..d13e2d0 100755 --- a/shell/main.c +++ b/shell/main.c @@ -43,6 +43,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #ifdef _MSC_VER # pragma warning(disable : 4127) # pragma warning(disable : 4706) @@ -173,7 +177,7 @@ static void _tidy_mem_pool(void) { for(i = 0; i < pool_count; i++) { while((s = pool[i].stack)) { - pool[i].stack = _POOL_NODE_NEXT(s); + pool[i].stack = (char*)_POOL_NODE_NEXT(s); _POOL_NODE_FREE(s); } } @@ -247,7 +251,7 @@ static void _close_mem_pool(void) { for(i = 0; i < pool_count; i++) { while((s = pool[i].stack)) { - pool[i].stack = _POOL_NODE_NEXT(s); + pool[i].stack = (char*)_POOL_NODE_NEXT(s); _POOL_NODE_FREE(s); } } @@ -275,7 +279,7 @@ static char* _pop_mem(unsigned s) { /* Pop from stack */ result = pl->stack; - pl->stack = _POOL_NODE_NEXT(result); + pl->stack = (char*)_POOL_NODE_NEXT(result); _POOL_NODE_SIZE(result) = (_pool_chunk_size_t)s; return result; @@ -969,3 +973,7 @@ int main(int argc, char* argv[]) { } /* ========================================================} */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */