Header cleanup in include dir

include/chameleon/morse_runtime.h

@@ -27,8 +27,11 @@
 #ifndef _MORSE_RUNTIME_H_
 #define _MORSE_RUNTIME_H_
 
+#include "chameleon/chameleon_config.h"
 #include "chameleon/morse_struct.h"
 
+BEGIN_C_DECLS
+
 /*******************************************************************************
  * RUNTIME Async
  **/
@@ -133,4 +136,6 @@ void RUNTIME_ddisplay_oneprofile (MORSE_kernel_t);
 void RUNTIME_sdisplay_allprofile ();
 void RUNTIME_sdisplay_oneprofile (MORSE_kernel_t);
 
+END_C_DECLS
+
 #endif /* _MORSE_RUNTIME_H_ */

include/chameleon/morse_struct.h

@@ -30,6 +30,9 @@
 
 #include "chameleon/chameleon_config.h"
 #include "chameleon/morse_types.h"
+#include "chameleon/morse_kernels.h"
+
+BEGIN_C_DECLS
 
 /** ****************************************************************************
  * RUNTIME headers to include types of :
@@ -184,10 +187,6 @@ typedef struct morse_option_s {
     void             *schedopt;
 } MORSE_option_t;
 
-
-/** ****************************************************************************
- *  MORSE kernels
- **/
-#include "chameleon/morse_kernels.h"
+END_C_DECLS
 
 #endif /* __CHAMELEON_H__ */

include/chameleon/morse_tasks.h

@@ -26,6 +26,10 @@
 #ifndef _MORSE_TASKS_H_
 #define _MORSE_TASKS_H_
 
+#include "chameleon/chameleon_config.h"
+
+BEGIN_C_DECLS
+
 /*******************************************************************************
  * MORSE Task submission routines
  **/
@@ -56,5 +60,6 @@ void MORSE_TASK_dataflush_all();
 #include "chameleon/morse_tasks_zc.h"
 #include "chameleon/morse_tasks_ds.h"
 
+END_C_DECLS
 
 #endif /* _MORSE_TASKS_H_ */

include/chameleon/morse_tasks_z.h

@@ -34,11 +34,6 @@
 
 #define COMPLEX
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /** ****************************************************************************
  *  Declarations of QUARK wrappers (called by MORSE) - alphabetical order
  **/
@@ -466,11 +461,6 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options,
                         const MORSE_desc_t *A, int Am, int An, int lda,
                         void *user_data, void* user_build_callback );
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #undef COMPLEX
 
 #endif

include/chameleon/morse_tasks_zc.h

@@ -31,11 +31,6 @@
 #ifndef _MORSE_TASKS_Z_H_
 #define _MORSE_TASKS_Z_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /** ****************************************************************************
  *  Declarations of QUARK wrappers (called by MORSE) - alphabetical order
  **/
@@ -48,9 +43,4 @@ void MORSE_TASK_zlag2c(MORSE_option_t *options,
                        MORSE_desc_t *A, int Am, int An, int lda,
                        MORSE_desc_t *B, int Bm, int Bn, int ldb);
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

include/chameleon/morse_types.h

@@ -28,6 +28,8 @@
 #ifndef _MORSE_TYPES_H_
 #define _MORSE_TYPES_H_
 
+#include "chameleon/chameleon_config.h"
+
 /** ****************************************************************************
  *  System requirements
  **/
@@ -119,6 +121,7 @@ typedef long MORSE_size;
 #define MORSE_DEPRECATED
 #endif /* __GNUC__ */
 
+BEGIN_C_DECLS
 
 /*******************************************************************************
  *  Global utilities
@@ -131,4 +134,6 @@ static inline int chameleon_min( int a, int b ) {
     if ( a < b ) return a; else return b;
 }
 
+END_C_DECLS
+
 #endif /* __CHAMELEON_H__ */

include/chameleon/morse_z.h

@@ -35,9 +35,7 @@
 #undef REAL
 #define COMPLEX
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 /** ****************************************************************************
  *  Declarations of math functions (LAPACK layout) - alphabetical order
@@ -361,9 +359,7 @@ int MORSE_zbuild(MORSE_enum uplo, int M, int N, MORSE_Complex64_t *A, int LDA, v
 int MORSE_zbuild_Tile(MORSE_enum uplo,  MORSE_desc_t *A, void *user_data, void* user_build_callback );
 int MORSE_zbuild_Tile_Async(MORSE_enum uplo, MORSE_desc_t *A, void *user_data, void* user_build_callback, MORSE_sequence_t *sequence, MORSE_request_t  *request);
 
-#ifdef __cplusplus
-}
-#endif
+END_C_DECLS
 
 #undef COMPLEX
 

include/chameleon/morse_zc.h

@@ -29,9 +29,7 @@
 #ifndef _MORSE_ZC_H_
 #define _MORSE_ZC_H_
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 /** ****************************************************************************
  *  Declarations of math functions (LAPACK layout) - alphabetical order
@@ -57,8 +55,6 @@ extern "C" {
 //int MORSE_zcgels_Tile_Async(MORSE_enum trans, MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B, MORSE_desc_t *X, int *ITER, MORSE_sequence_t *sequence, MORSE_request_t *request);
 //int MORSE_zcungesv_Tile_Async(MORSE_enum trans, MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B, MORSE_desc_t *X, int *ITER, MORSE_sequence_t *sequence, MORSE_request_t *request);
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
 
 #endif