1 files changed, 12 insertions, 12 deletions

diff --git a/libgfortran/intrinsics/date_and_time.c b/libgfortran/intrinsics/date_and_time.c
index 3c386363df4..c785f84c0d9 100644
--- a/libgfortran/intrinsics/date_and_time.c
+++ b/libgfortran/intrinsics/date_and_time.c
@@ -1,5 +1,5 @@
 /* Implementation of the DATE_AND_TIME intrinsic.
-   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
    Contributed by Steven Bosscher.
 
@@ -208,14 +208,14 @@ date_and_time (char *__date, char *__time, char *__zone,
       /* Cope with different type kinds.  */
       if (elt_size == 4)
         {
-	  GFC_INTEGER_4 *vptr4 = __values->data;
+	  GFC_INTEGER_4 *vptr4 = __values->base_addr;
 
 	  for (i = 0; i < VALUES_SIZE; i++, vptr4 += delta)
 	    *vptr4 = values[i];
 	}
       else if (elt_size == 8)
         {
-	  GFC_INTEGER_8 *vptr8 = (GFC_INTEGER_8 *)__values->data;
+	  GFC_INTEGER_8 *vptr8 = (GFC_INTEGER_8 *)__values->base_addr;
 
 	  for (i = 0; i < VALUES_SIZE; i++, vptr8 += delta)
 	    {
@@ -271,7 +271,7 @@ secnds (GFC_REAL_4 *x)
 
   /* Make the INTEGER*4 array for passing to date_and_time.  */
   gfc_array_i4 *avalues = internal_malloc_size (sizeof (gfc_array_i4));
-  avalues->data = &values[0];
+  avalues->base_addr = &values[0];
   GFC_DESCRIPTOR_DTYPE (avalues) = ((BT_REAL << GFC_DTYPE_TYPE_SHIFT)
 				        & GFC_DTYPE_TYPE_MASK) +
 				    (4 << GFC_DTYPE_SIZE_SHIFT);
@@ -336,7 +336,7 @@ itime_i4 (gfc_array_i4 *__values)
   if (delta == 0)
     delta = 1;
 
-  vptr = __values->data;
+  vptr = __values->base_addr;
   for (i = 0; i < 3; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -362,7 +362,7 @@ itime_i8 (gfc_array_i8 *__values)
   if (delta == 0)
     delta = 1;
 
-  vptr = __values->data;
+  vptr = __values->base_addr;
   for (i = 0; i < 3; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -414,7 +414,7 @@ idate_i4 (gfc_array_i4 *__values)
   if (delta == 0)
     delta = 1;
 
-  vptr = __values->data;
+  vptr = __values->base_addr;
   for (i = 0; i < 3; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -440,7 +440,7 @@ idate_i8 (gfc_array_i8 *__values)
   if (delta == 0)
     delta = 1;
 
-  vptr = __values->data;
+  vptr = __values->base_addr;
   for (i = 0; i < 3; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -504,7 +504,7 @@ gmtime_i4 (GFC_INTEGER_4 * t, gfc_array_i4 * tarray)
   if (delta == 0)
     delta = 1;
 
-  vptr = tarray->data;
+  vptr = tarray->base_addr;
   for (i = 0; i < 9; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -531,7 +531,7 @@ gmtime_i8 (GFC_INTEGER_8 * t, gfc_array_i8 * tarray)
   if (delta == 0)
     delta = 1;
 
-  vptr = tarray->data;
+  vptr = tarray->base_addr;
   for (i = 0; i < 9; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -596,7 +596,7 @@ ltime_i4 (GFC_INTEGER_4 * t, gfc_array_i4 * tarray)
   if (delta == 0)
     delta = 1;
 
-  vptr = tarray->data;
+  vptr = tarray->base_addr;
   for (i = 0; i < 9; i++, vptr += delta)
     *vptr = x[i];
 }
@@ -623,7 +623,7 @@ ltime_i8 (GFC_INTEGER_8 * t, gfc_array_i8 * tarray)
   if (delta == 0)
     delta = 1;
 
-  vptr = tarray->data;
+  vptr = tarray->base_addr;
   for (i = 0; i < 9; i++, vptr += delta)
     *vptr = x[i];
 }