PR libfortran/18966

[pf3gnuchains/gcc-fork.git] / libgfortran / intrinsics / eoshift2.c

diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c
index 18c3f55..67ca7d2 100644 (file)
--- a/libgfortran/intrinsics/eoshift2.c
+++ b/libgfortran/intrinsics/eoshift2.c
@@ -32,8 +32,8 @@ static const char zeros[16] =
    sizeof(int) < sizeof (index_type).  */
 
 static void
-__eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
-    int shift, const gfc_array_char * bound, int which)
+eoshift2 (gfc_array_char *ret, const gfc_array_char *array,
+         int shift, const gfc_array_char *bound, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -65,7 +65,7 @@ __eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
     {
       int i;
 
-      ret->data = internal_malloc (size * size0 ((array_t *)array));
+      ret->data = internal_malloc_size (size * size0 ((array_t *)array));
       ret->base = 0;
       ret->dtype = array->dtype;
       for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++)
@@ -204,20 +204,58 @@ __eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
 }
 
 
+extern void eoshift2_1 (gfc_array_char *, const gfc_array_char *,
+                       const GFC_INTEGER_1 *, const gfc_array_char *,
+                       const GFC_INTEGER_1 *);
+export_proto(eoshift2_1);
+
+void
+eoshift2_1 (gfc_array_char *ret, const gfc_array_char *array,
+           const GFC_INTEGER_1 *pshift, const gfc_array_char *bound,
+           const GFC_INTEGER_1 *pdim)
+{
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+}
+
+
+extern void eoshift2_2 (gfc_array_char *, const gfc_array_char *,
+                       const GFC_INTEGER_2 *, const gfc_array_char *,
+                       const GFC_INTEGER_2 *);
+export_proto(eoshift2_2);
+
 void
-__eoshift2_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const gfc_array_char * bound,
-    const GFC_INTEGER_4 * pdim)
+eoshift2_2 (gfc_array_char *ret, const gfc_array_char *array,
+           const GFC_INTEGER_2 *pshift, const gfc_array_char *bound,
+           const GFC_INTEGER_2 *pdim)
 {
-  __eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
 }
 
 
+extern void eoshift2_4 (gfc_array_char *, const gfc_array_char *,
+                       const GFC_INTEGER_4 *, const gfc_array_char *,
+                       const GFC_INTEGER_4 *);
+export_proto(eoshift2_4);
+
+void
+eoshift2_4 (gfc_array_char *ret, const gfc_array_char *array,
+           const GFC_INTEGER_4 *pshift, const gfc_array_char *bound,
+           const GFC_INTEGER_4 *pdim)
+{
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+}
+
+
+extern void eoshift2_8 (gfc_array_char *, const gfc_array_char *,
+                       const GFC_INTEGER_8 *, const gfc_array_char *,
+                       const GFC_INTEGER_8 *);
+export_proto(eoshift2_8);
+
 void
-__eoshift2_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const gfc_array_char * bound,
-    const GFC_INTEGER_8 * pdim)
+eoshift2_8 (gfc_array_char *ret, const gfc_array_char *array,
+           const GFC_INTEGER_8 *pshift, const gfc_array_char *bound,
+           const GFC_INTEGER_8 *pdim)
 {
-  __eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
 }