Fix problem with getdate on mingw32 reported by Simon Josefsson

[gnulib.git] / lib / striconveha.c

diff --git a/lib/striconveha.c b/lib/striconveha.c
index 78dfddc..704faab 100644 (file)
--- a/lib/striconveha.c
+++ b/lib/striconveha.c
@@ -2,10 +2,10 @@
    Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -25,8 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "allocsa.h"
-#include "strdup.h"
+#include "malloca.h"
 #include "c-strcase.h"
 
 #define SIZEOF(a) (sizeof(a)/sizeof(a[0]))
@@ -232,7 +230,7 @@ mem_iconveha (const char *src, size_t srclen,
     {
       int retval;
       size_t len = strlen (to_codeset);
-      char *to_codeset_suffixed = (char *) allocsa (len + 10 + 1);
+      char *to_codeset_suffixed = (char *) malloca (len + 10 + 1);
       memcpy (to_codeset_suffixed, to_codeset, len);
       memcpy (to_codeset_suffixed + len, "//TRANSLIT", 10 + 1);
 
@@ -240,7 +238,7 @@ mem_iconveha (const char *src, size_t srclen,
                                        from_codeset, to_codeset_suffixed,
                                        handler, offsets, resultp, lengthp);
 
-      freesa (to_codeset_suffixed);
+      freea (to_codeset_suffixed);
 
       return retval;
     }
@@ -332,14 +330,14 @@ str_iconveha (const char *src,
     {
       char *result;
       size_t len = strlen (to_codeset);
-      char *to_codeset_suffixed = (char *) allocsa (len + 10 + 1);
+      char *to_codeset_suffixed = (char *) malloca (len + 10 + 1);
       memcpy (to_codeset_suffixed, to_codeset, len);
       memcpy (to_codeset_suffixed + len, "//TRANSLIT", 10 + 1);
 
       result = str_iconveha_notranslit (src, from_codeset, to_codeset_suffixed,
                                        handler);
 
-      freesa (to_codeset_suffixed);
+      freea (to_codeset_suffixed);
 
       return result;
     }