Some minor include changes

AmigaLabs · Dec 6, 2023 · d708d1a · d708d1a
1 parent 82e61d2
commit d708d1a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/library/include/pthread.h b/library/include/pthread.h
@@ -31,12 +31,7 @@
 #include <sched.h>
 #include <features.h>
 
-#ifdef __cplusplus
-#ifdef __USE_AMIGAOS_NAMESPACE__
-namespace AmigaOS {
-#endif
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 //
 // POSIX options
@@ -414,11 +409,6 @@ extern void pthread_cleanup_pop(int execute);
 
 extern int pthread_kill(pthread_t thread, int sig);
 
-#ifdef __cplusplus
-}
-#ifdef __USE_AMIGAOS_NAMESPACE__
-}
-#endif
-#endif
+__END_DECLS
 
 #endif
diff --git a/library/include/signal.h b/library/include/signal.h
@@ -6,7 +6,6 @@
 #define _SIGNAL_H
 
 #include <features.h>
-#include <pthread.h>
 
 __BEGIN_DECLS
 

diff --git a/library/include/sys/cdefs.h b/library/include/sys/cdefs.h
@@ -23,13 +23,21 @@
 #define __flexarr [0]
 
 #ifdef __cplusplus
-#define __BEGIN_DECLS \
-	extern "C"        \
-	{
-#define __END_DECLS }
+    #ifdef __USE_AMIGAOS_NAMESPACE__
+        #define __BEGIN_DECLS \
+        namespace AmigaOS {   \
+            extern "C"        \
+            {
+        #define __END_DECLS } }
+    #else
+        #define __BEGIN_DECLS \
+            extern "C"        \
+            {
+        #define __END_DECLS }
+    #endif
 #else
-#define __BEGIN_DECLS
-#define __END_DECLS
+    #define __BEGIN_DECLS
+    #define __END_DECLS
 #endif
 
 #ifndef __BOUNDED_POINTERS__