revert #5364 and #5365 to avoid errors in C++

doc/chapters/basic-api.texi

@@ -1072,21 +1072,17 @@ This section describes the interface to manipulate codelets and tasks.
 todo
 @end deftp
 
-@deftp {Data Type} {enum starpu_codelet_where}
-This type enumerates possible values for the field @code{where} of
-@code{struct starpu_codelet} defined below. The different values
-@code{STARPU_CPU}, @code{STARPU_CUDA}, @code{STARPU_SPU},
-@code{STARPU_GORDON}, @code{STARPU_OPENCL} can be combined to specify
-on which types of processing units the codelet can be executed.
-@end deftp
-
 @deftp {Data Type} {struct starpu_codelet}
 The codelet structure describes a kernel that is possibly implemented on various
 targets. For compatibility, make sure to initialize the whole structure to zero.
 
 @table @asis
 @item @code{where} (optional)
-Indicates which types of processing units are able to execute the codelet.
+Indicates which types of processing units are able to execute the
+codelet. The different values
+@code{STARPU_CPU}, @code{STARPU_CUDA}, @code{STARPU_SPU},
+@code{STARPU_GORDON}, @code{STARPU_OPENCL} can be combined to specify
+on which types of processing units the codelet can be executed.
 @code{STARPU_CPU|STARPU_CUDA} for instance indicates that the codelet is
 implemented for both CPU cores and CUDA devices while @code{STARPU_GORDON}
 indicates that it is only available on Cell SPUs. If the field is

include/starpu_task.h

@@ -33,14 +33,11 @@ extern "C"
 {
 #endif
 
-enum starpu_codelet_where
-{
-	STARPU_CPU=((1ULL)<<1),
-	STARPU_CUDA=((1ULL)<<3),
-	STARPU_SPU=((1ULL)<<4),
-	STARPU_GORDON=((1ULL)<<5),
-	STARPU_OPENCL=((1ULL)<<6)
-};
+#define STARPU_CPU	((1ULL)<<1)
+#define STARPU_CUDA	((1ULL)<<3)
+#define	STARPU_SPU	((1ULL)<<4),
+#define	STARPU_GORDON	((1ULL)<<5)
+#define STARPU_OPENCL	((1ULL)<<6)
 
 /* Codelet types */
 enum starpu_codelet_type