Repairing damage and recovering changes including C++ wrappers..

12 files changed, 106 insertions, 9 deletions

diff --git a/c/src/exec/posix/include/devctl.h b/c/src/exec/posix/include/devctl.h
index 5073b475ee..85fca4cc11 100644
--- a/c/src/exec/posix/include/devctl.h
+++ b/c/src/exec/posix/include/devctl.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_DEVICE_CONTROL_h
 #define __POSIX_DEVICE_CONTROL_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 #if defined(_POSIX_DEVICE_CONTROL)
 
@@ -26,5 +30,9 @@ int devctl(
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/c/src/exec/posix/include/intr.h b/c/src/exec/posix/include/intr.h
index f07d1f9552..48aaf64160 100644
--- a/c/src/exec/posix/include/intr.h
+++ b/c/src/exec/posix/include/intr.h
@@ -9,7 +9,11 @@
 #ifndef __POSIX_INTERRUPTS_h
 #define __POSIX_INTERRUPTS_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
@@ -68,5 +72,9 @@ int intr_timed_wait(
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/c/src/exec/posix/include/mqueue.h b/c/src/exec/posix/include/mqueue.h
index f1b2250e5c..8d117862ea 100644
--- a/c/src/exec/posix/include/mqueue.h
+++ b/c/src/exec/posix/include/mqueue.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_MESSAGE_QUEUE_h
 #define __POSIX_MESSAGE_QUEUE_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 #if defined(_POSIX_MESSAGE_PASSING)
 
@@ -141,5 +145,9 @@ int mq_getattr(
 
 #endif /* _POSIX_MESSAGE_PASSING */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/c/src/exec/posix/include/pthread.h b/c/src/exec/posix/include/pthread.h
index d70a794f38..8141a53548 100644
--- a/c/src/exec/posix/include/pthread.h
+++ b/c/src/exec/posix/include/pthread.h
@@ -6,6 +6,10 @@
 #ifndef __PTHREAD_h
 #define __PTHREAD_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <sys/features.h>
 
 #if defined(_POSIX_THREADS)
@@ -496,5 +500,10 @@ int pthread_attr_getcputime(
 #endif /* defined(_POSIX_THREAD_CPUTIME) */
 
 #endif /* defined(_POSIX_THREADS) */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/c/src/exec/posix/include/sched.h b/c/src/exec/posix/include/sched.h
index 14a603c0c5..ccc42d35e2 100644
--- a/c/src/exec/posix/include/sched.h
+++ b/c/src/exec/posix/include/sched.h
@@ -7,6 +7,10 @@
 #ifndef __POSIX_SCHEDULING_h
 #define __POSIX_SCHEDULING_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <sys/features.h>
 
 #if defined(_POSIX_PRIORITY_SCHEDULING)
@@ -83,6 +87,10 @@ int sched_yield( void );
 
 #endif /* _POSIX_THREADS or _POSIX_PRIORITY_SCHEDULING */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
 
diff --git a/c/src/exec/posix/include/semaphore.h b/c/src/exec/posix/include/semaphore.h
index 0388f91ad9..79e85f2d6a 100644
--- a/c/src/exec/posix/include/semaphore.h
+++ b/c/src/exec/posix/include/semaphore.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_SEMAPHORE_h
 #define __POSIX_SEMAPHORE_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 #if defined(_POSIX_SEMAPHORES)
 
@@ -104,5 +108,9 @@ int sem_getvalue(
 
 #endif   /* _POSIX_SEMAPHORES */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/c/src/exec/posix/include/unistd.h b/c/src/exec/posix/include/unistd.h
index 0001ecc475..207fe14fd0 100644
--- a/c/src/exec/posix/include/unistd.h
+++ b/c/src/exec/posix/include/unistd.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_UNISTD_h
 #define __POSIX_UNISTD_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 /*
  *  4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 96
@@ -85,5 +89,9 @@ long sysconf(
   int name
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include */
diff --git a/cpukit/posix/include/devctl.h b/cpukit/posix/include/devctl.h
index 5073b475ee..85fca4cc11 100644
--- a/cpukit/posix/include/devctl.h
+++ b/cpukit/posix/include/devctl.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_DEVICE_CONTROL_h
 #define __POSIX_DEVICE_CONTROL_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 #if defined(_POSIX_DEVICE_CONTROL)
 
@@ -26,5 +30,9 @@ int devctl(
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/cpukit/posix/include/intr.h b/cpukit/posix/include/intr.h
index f07d1f9552..48aaf64160 100644
--- a/cpukit/posix/include/intr.h
+++ b/cpukit/posix/include/intr.h
@@ -9,7 +9,11 @@
 #ifndef __POSIX_INTERRUPTS_h
 #define __POSIX_INTERRUPTS_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
@@ -68,5 +72,9 @@ int intr_timed_wait(
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/cpukit/posix/include/mqueue.h b/cpukit/posix/include/mqueue.h
index f1b2250e5c..8d117862ea 100644
--- a/cpukit/posix/include/mqueue.h
+++ b/cpukit/posix/include/mqueue.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_MESSAGE_QUEUE_h
 #define __POSIX_MESSAGE_QUEUE_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 #if defined(_POSIX_MESSAGE_PASSING)
 
@@ -141,5 +145,9 @@ int mq_getattr(
 
 #endif /* _POSIX_MESSAGE_PASSING */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
diff --git a/cpukit/posix/include/sched.h b/cpukit/posix/include/sched.h
index 14a603c0c5..ccc42d35e2 100644
--- a/cpukit/posix/include/sched.h
+++ b/cpukit/posix/include/sched.h
@@ -7,6 +7,10 @@
 #ifndef __POSIX_SCHEDULING_h
 #define __POSIX_SCHEDULING_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <sys/features.h>
 
 #if defined(_POSIX_PRIORITY_SCHEDULING)
@@ -83,6 +87,10 @@ int sched_yield( void );
 
 #endif /* _POSIX_THREADS or _POSIX_PRIORITY_SCHEDULING */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */
 
diff --git a/cpukit/posix/include/semaphore.h b/cpukit/posix/include/semaphore.h
index 0388f91ad9..79e85f2d6a 100644
--- a/cpukit/posix/include/semaphore.h
+++ b/cpukit/posix/include/semaphore.h
@@ -6,7 +6,11 @@
 #ifndef __POSIX_SEMAPHORE_h
 #define __POSIX_SEMAPHORE_h
 
-#include <rtems/posix/features.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/features.h>
 
 #if defined(_POSIX_SEMAPHORES)
 
@@ -104,5 +108,9 @@ int sem_getvalue(
 
 #endif   /* _POSIX_SEMAPHORES */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /* end of include file */