From 6868130cfd92a3ec52cc099ec7ba5da12af2e4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B1=AA=20=7C=20Jacob=20Chen?= <547884940@qq.com> Date: Sun, 29 Mar 2015 18:41:44 +0800 Subject: [PATCH 1/3] [bsp]x86:fix compile error when use i386.h in c++ --- bsp/x86/drivers/include/i386.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bsp/x86/drivers/include/i386.h b/bsp/x86/drivers/include/i386.h index 4b5a0e7bd0..fe023d754a 100644 --- a/bsp/x86/drivers/include/i386.h +++ b/bsp/x86/drivers/include/i386.h @@ -105,4 +105,8 @@ struct Pseudodesc { #define STS_IG32 0xe // 32-bit Interrupt Gate #define STS_TG32 0xf // 32-bit Trap Gate +#ifdef __cplusplus + } +#endif + #endif From d642d915eb5bd5f85e0ca50f502970eb78e1fe83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B1=AA=20=7C=20Jacob=20Chen?= <547884940@qq.com> Date: Sun, 29 Mar 2015 18:42:31 +0800 Subject: [PATCH 2/3] [bsp]x86:fix compile error when use bsp.h in c++ --- bsp/x86/drivers/include/bsp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bsp/x86/drivers/include/bsp.h b/bsp/x86/drivers/include/bsp.h index e14e589274..f664b16a2d 100644 --- a/bsp/x86/drivers/include/bsp.h +++ b/bsp/x86/drivers/include/bsp.h @@ -16,6 +16,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif +c /*******************************************************************/ /* Timer Register */ /*******************************************************************/ From 7aeb40204c473167e44b75b44e4dd8d0015c7ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B1=AA=20=7C=20Jacob=20Chen?= <547884940@qq.com> Date: Sun, 29 Mar 2015 21:16:38 +0800 Subject: [PATCH 3/3] Update bsp.h --- bsp/x86/drivers/include/bsp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/x86/drivers/include/bsp.h b/bsp/x86/drivers/include/bsp.h index f664b16a2d..8739e185ad 100644 --- a/bsp/x86/drivers/include/bsp.h +++ b/bsp/x86/drivers/include/bsp.h @@ -19,7 +19,7 @@ #ifdef __cplusplus extern "C" { #endif -c + /*******************************************************************/ /* Timer Register */ /*******************************************************************/