gcc/fortran/

[pf3gnuchains/gcc-fork.git] / libgfortran / m4 / cshift1.m4

diff --git a/libgfortran/m4/cshift1.m4 b/libgfortran/m4/cshift1.m4
index 59c5d7e..5c3d0b0 100644 (file)
--- a/libgfortran/m4/cshift1.m4
+++ b/libgfortran/m4/cshift1.m4
@@ -35,15 +35,9 @@ Boston, MA 02110-1301, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-void cshift1_`'atype_kind (gfc_array_char * ret,
-                          const gfc_array_char * array,
-                          const atype * h, const atype_name * pwhich);
-export_proto(cshift1_`'atype_kind);
-
-void
-cshift1_`'atype_kind (gfc_array_char * ret,
-                     const gfc_array_char * array,
-                     const atype * h, const atype_name * pwhich)
+static void
+cshift1 (gfc_array_char * ret, const gfc_array_char * array,
+        const atype * h, const atype_name * pwhich, index_type size)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -65,7 +59,6 @@ cshift1_`'atype_kind (gfc_array_char * ret,
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
   index_type dim;
-  index_type size;
   index_type len;
   index_type n;
   int which;
@@ -79,8 +72,6 @@ cshift1_`'atype_kind (gfc_array_char * ret,
   if (which < 0 || (which + 1) > GFC_DESCRIPTOR_RANK (array))
     runtime_error ("Argument 'DIM' is out of range in call to 'CSHIFT'");
 
-  size = GFC_DESCRIPTOR_SIZE (ret);
-
   if (ret->data == NULL)
     {
       int i;
@@ -102,7 +93,6 @@ cshift1_`'atype_kind (gfc_array_char * ret,
 
   extent[0] = 1;
   count[0] = 0;
-  size = GFC_DESCRIPTOR_SIZE (array);
   n = 0;
 
   /* Initialized for avoiding compiler warnings.  */
@@ -202,3 +192,31 @@ cshift1_`'atype_kind (gfc_array_char * ret,
         }
     }
 }
+
+void cshift1_`'atype_kind (gfc_array_char *, const gfc_array_char *,
+                          const atype *, const atype_name *);
+export_proto(cshift1_`'atype_kind);
+
+void
+cshift1_`'atype_kind (gfc_array_char * ret,
+                     const gfc_array_char * array,
+                     const atype * h, const atype_name * pwhich)
+{
+  cshift1 (ret, array, h, pwhich, GFC_DESCRIPTOR_SIZE (array));
+}
+
+void cshift1_`'atype_kind`'_char (gfc_array_char * ret, GFC_INTEGER_4,
+                                 const gfc_array_char * array,
+                                 const atype * h, const atype_name * pwhich,
+                                 GFC_INTEGER_4);
+export_proto(cshift1_`'atype_kind`'_char);
+
+void
+cshift1_`'atype_kind`'_char (gfc_array_char * ret,
+                            GFC_INTEGER_4 ret_length __attribute__((unused)),
+                            const gfc_array_char * array,
+                            const atype * h, const atype_name * pwhich,
+                            GFC_INTEGER_4 array_length)
+{
+  cshift1 (ret, array, h, pwhich, array_length);
+}