Fixed register for GCC-7 compatibility

Author: Alessandro Fanfarillo

src/libcaf.h

@@ -117,8 +117,8 @@ void PREFIX (finalize) (void);
 int PREFIX (this_image) (int);
 int PREFIX (num_images) (int, int);
 
-void *PREFIX (register) (size_t, caf_register_t, caf_token_t *, int *, char *,
-			int);
+void PREFIX (register) (size_t, caf_register_t, caf_token_t *, gfc_descriptor_t *,
+			int *, char *, int);
 void PREFIX (deregister) (caf_token_t *, int *, char *, int);
 
 void PREFIX (caf_get) (caf_token_t, size_t, int, gfc_descriptor_t *,

src/mpi/mpi_caf.c

@@ -674,9 +674,10 @@ void *
   _gfortran_caf_register (size_t size, caf_register_t type, caf_token_t *token,
                   int *stat, char *errmsg, int errmsg_len)
 #else
-void *
+void
   PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
-                  int *stat, char *errmsg, int errmsg_len)
+		     gfc_descriptor_t *desc, int *stat, char *errmsg,
+		     int errmsg_len)
 #endif
 {
   /* int ierr; */
@@ -787,7 +788,9 @@ void *
   else if (ierr == STAT_FAILED_IMAGE)
     error_stop (ierr);
 
-  return mem;
+  desc->base_addr = mem;
+
+  return;
 
 error:
   {