浏览代码

make __starpu_inline even more portable

Samuel Thibault 12 年之前
父节点
当前提交
1fa37aac23
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      include/starpu_config.h.in

+ 7 - 4
include/starpu_config.h.in

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2012  Université de Bordeaux 1
+ * Copyright (C) 2009-2013  Université de Bordeaux 1
  * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -89,10 +89,13 @@ typedef ssize_t starpu_ssize_t;
 #define __starpu_func__ __func__
 #endif
 
-#ifdef STARPU_HAVE_WINDOWS
-#define __starpu_inline __inline
+#if defined(c_plusplus) || defined(__cplusplus)
+/* inline is part of C++ */
+#  define __starpu_inline inline
+#elif defined(_MSC_VER) || defined(__HP_cc)
+#  define __starpu_inline __inline
 #else
-#define __starpu_inline inline
+#  define __starpu_inline __inline__
 #endif
 
 #undef STARPU_QUICK_CHECK