With r17906, this commit should make the trunk compile again.

This commit was SVN r17907.

The following SVN revision numbers were found above:
  r17906 --> open-mpi/ompi@df4a6c3fc5

ompi/op/op_predefined.h

@@ -280,7 +280,7 @@ extern "C" {
  * 3 buffer prototypes (two input and one output)
  */
 #define OMPI_OP_PROTO_3BUF  \
-  (restrict void *in1, restrict void *in2, restrict void *out, \
+  (void * restrict in1, void * restrict in2, void * restrict out, \
    int *count, MPI_Datatype *dtype)
 
 /* C integer */