2010-06-14 Ralf Corsépius <ralf.corsepius@rtems.org>

	* libnetworking/rtems/mkrootfs.h,
	posix/include/rtems/posix/pthread.h,
	score/include/rtems/score/coresem.h,
	score/include/rtems/score/priority.h,
	score/include/rtems/score/threadq.h,
	score/include/rtems/score/timestamp.h: Move 'extern "C"'.

7 files changed, 25 insertions, 19 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index f1800ff735..7c3ca8f4a8 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-14	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* libnetworking/rtems/mkrootfs.h,
+	posix/include/rtems/posix/pthread.h,
+	score/include/rtems/score/coresem.h,
+	score/include/rtems/score/priority.h,
+	score/include/rtems/score/threadq.h,
+	score/include/rtems/score/timestamp.h: Move 'extern "C"'.
 	* posix/include/rtems/posix/threadsup.h: Add extern "C".
 	* libnetworking/netinet/in_pcb.c:
 	Eliminate "ushort".
diff --git a/cpukit/libnetworking/rtems/mkrootfs.h b/cpukit/libnetworking/rtems/mkrootfs.h
index a8d0284c84..bfd25389c1 100644
--- a/cpukit/libnetworking/rtems/mkrootfs.h
+++ b/cpukit/libnetworking/rtems/mkrootfs.h
@@ -24,12 +24,12 @@
 #ifndef _RTEMS_MKROOTFS_H
 #define _RTEMS_MKROOTFS_H
 
+#include <rtems.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <rtems.h>
-
 /*
  *  Appends the lines to the a file. Create the file
  *  and builds the path if it does not exist.
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/posix/include/rtems/posix/pthread.h
index 176a408d68..51dae8737e 100644
--- a/cpukit/posix/include/rtems/posix/pthread.h
+++ b/cpukit/posix/include/rtems/posix/pthread.h
@@ -20,13 +20,13 @@
 #ifndef _RTEMS_POSIX_PTHREAD_H
 #define _RTEMS_POSIX_PTHREAD_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <rtems/posix/config.h>
 #include <rtems/posix/threadsup.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /**
  *  The following sets the minimum stack size for POSIX threads.
  */
diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/score/include/rtems/score/coresem.h
index 373965f67e..ae3754129b 100644
--- a/cpukit/score/include/rtems/score/coresem.h
+++ b/cpukit/score/include/rtems/score/coresem.h
@@ -29,15 +29,15 @@
  */
 /**@{*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/priority.h>
 #include <rtems/score/watchdog.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(RTEMS_POSIX_API) || defined(RTEMS_ITRON_API)
   #define RTEMS_SCORE_CORESEM_ENABLE_SEIZE_BODY
 #endif
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/score/include/rtems/score/priority.h
index 3aba088d06..5a1dccaecc 100644
--- a/cpukit/score/include/rtems/score/priority.h
+++ b/cpukit/score/include/rtems/score/priority.h
@@ -36,15 +36,15 @@
  */
 /**@{*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Processor specific information.
  */
 #include <rtems/score/cpu.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  The following type defines the control block used to manage
  *  thread priorities.
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h
index 7519fdae54..357bbf713c 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/cpukit/score/include/rtems/score/threadq.h
@@ -27,16 +27,16 @@
  */
 /**@{*/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <rtems/score/tqdata.h>
 
 #include <rtems/score/object.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/watchdog.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  Constant for indefinite wait.
  */
diff --git a/cpukit/score/include/rtems/score/timestamp.h b/cpukit/score/include/rtems/score/timestamp.h
index 25ac57f025..6789e83e93 100644
--- a/cpukit/score/include/rtems/score/timestamp.h
+++ b/cpukit/score/include/rtems/score/timestamp.h
@@ -38,12 +38,12 @@
  */
 /**@{*/
 
+#include <rtems/score/timespec.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <rtems/score/timespec.h>
-
 /*
  *  NOTE: Eventually each port should select what it should use!!!
  *