From 46dde0fcefbff77eb814b3b0662cb01fb280d437 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 23 Oct 2014 10:05:17 +0200
Subject: bsps: Move extern "C" to not cover includes

Some includes may use C++ and this conflicts if surrounded extern "C".
---
 c/src/lib/libbsp/sh/gensh1/include/bsp.h | 8 ++++----
 c/src/lib/libbsp/sh/gensh2/include/bsp.h | 8 ++++----
 c/src/lib/libbsp/sh/gensh4/include/bsp.h | 8 ++++----
 c/src/lib/libbsp/sh/shsim/include/bsp.h  | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'c/src/lib/libbsp/sh')

diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index 6f7c77b809..ced4967c93 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -25,10 +25,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rtems.h>
 #include <rtems/clockdrv.h>
 #include <rtems/console.h>
@@ -36,6 +32,10 @@ extern "C" {
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* EDIT: To activate the sci driver, change the define below */
 #if 1
 #include <rtems/devnull.h>
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
index 5ef882a5bf..6ab35109d1 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
@@ -36,10 +36,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rtems.h>
 #include <rtems/clockdrv.h>
 #include <rtems/console.h>
@@ -51,6 +47,10 @@ extern "C" {
 
 #include <sh/sci.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if 1
 /* FIXME:
  *   These definitions will be no longer necessary if the old
diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
index a2b41d0e4d..e9d39a9ee8 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
@@ -40,10 +40,6 @@
 #ifndef _BSP_H
 #define _BSP_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rtems.h>
 #include <rtems/clockdrv.h>
 #include <rtems/console.h>
@@ -53,6 +49,10 @@ extern "C" {
 
 #include "rtems/score/sh7750_regs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Constants */
 
 /*
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h
index bb8a4a5255..6e606b4e2e 100644
--- a/c/src/lib/libbsp/sh/shsim/include/bsp.h
+++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h
@@ -26,10 +26,6 @@
 
 #ifndef ASM
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rtems.h>
 #include <rtems/clockdrv.h>
 #include <rtems/console.h>
@@ -42,6 +38,10 @@ extern "C" {
  */
 #include <rtems/devnull.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Constants */
 
 Thread clock_driver_sim_idle_body(uintptr_t);
-- 
cgit v1.2.3