avoid #including headers inside extern "C" {}, since those headers might have c++ snippets

include/pthread_win32/pthread.h

@@ -27,10 +27,6 @@
  * pthread_spinlock_*
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <windows.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -62,6 +58,10 @@ extern "C" {
 #define winPthreadAssert(expr) do { if (!(expr)) return EIO; } while (0)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /***********
  * threads *
  ***********/

include/starpu_sched_component.h

@@ -20,15 +20,15 @@
 
 #include <starpu.h>
 
+#ifdef STARPU_HAVE_HWLOC
+#include <hwloc.h>
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-#ifdef STARPU_HAVE_HWLOC
-#include <hwloc.h>
-#endif
-
 enum starpu_sched_component_properties
 {
 	STARPU_SCHED_COMPONENT_HOMOGENEOUS = (1<<0),

include/starpu_thread.h

@@ -18,11 +18,6 @@
 #ifndef __STARPU_THREAD_H__
 #define __STARPU_THREAD_H__
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #include <starpu_config.h>
 #include <starpu_util.h>
 #ifdef STARPU_SIMGRID
@@ -37,6 +32,11 @@ extern "C"
 #endif
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*
  * Encapsulation of the pthread_create function.
  */