10 files changed, 16 insertions, 16 deletions
diff --git a/lib/memxfrm.c b/lib/amemxfrm.c
index d0a3c78efa..3823ce4549 100644
--- a/lib/memxfrm.c
+++ b/lib/amemxfrm.c
@@ -18,14 +18,14 @@
 #include <config.h>
 
 /* Specification.  */
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
 char *
-memxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp)
+amemxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp)
 {
   /* Result accumulator.  */
   char *result;
diff --git a/lib/memxfrm.h b/lib/amemxfrm.h
index 8b7284a65d..2edf535ada 100644
--- a/lib/memxfrm.h
+++ b/lib/amemxfrm.h
@@ -1,5 +1,5 @@
 /* Locale dependent memory area transformation for comparison.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MEMXFRM_H
-#define MEMXFRM_H
+#ifndef AMEMXFRM_H
+#define AMEMXFRM_H
 
 #include <stddef.h>
 
@@ -28,7 +28,7 @@ extern "C" {
 
 /* Transform the memory area [S..S+N-1] to a memory area, in such a way that
    comparing (S1,N1) and (S2,N2) with memcoll() is equivalent to comparing
-   memxfrm(S1,N1) and memxfrm(S2,N2) with memcmp2().
+   amemxfrm(S1,N1) and amemxfrm(S2,N2) with memcmp2().
    The byte S[N] may be temporarily overwritten by this function, but will be
    restored before this function returns.
    The result of this function depends on the LC_COLLATE category of the
@@ -38,11 +38,11 @@ extern "C" {
    freshly allocated string is returned.  In both cases, *lengthp is set to the
    length of the returned string.
    Upon failure, return NULL, with errno set.  */
-extern char * memxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp);
+extern char * amemxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp);
 
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* MEMXFRM_H */
+#endif /* AMEMXFRM_H */
diff --git a/lib/unicase/u-casexfrm.h b/lib/unicase/u-casexfrm.h
index 5c7430c0fd..b2725d4a64 100644
--- a/lib/unicase/u-casexfrm.h
+++ b/lib/unicase/u-casexfrm.h
@@ -70,7 +70,7 @@ FUNC (const UNIT *s, size_t n, const char *iso639_language, uninorm_t nf,
     }
 
   /* Apply locale dependent transformations for comparison.  */
-  result = memxfrm (convs, convs_length, resultbuf, lengthp);
+  result = amemxfrm (convs, convs_length, resultbuf, lengthp);
   if (result == NULL)
     {
       if (convs != convsbuf)
diff --git a/lib/unicase/u16-casexfrm.c b/lib/unicase/u16-casexfrm.c
index 661902fc3c..63fe67495c 100644
--- a/lib/unicase/u16-casexfrm.c
+++ b/lib/unicase/u16-casexfrm.c
@@ -26,7 +26,7 @@
 
 #include "localcharset.h"
 #include "uniconv.h"
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #define FUNC u16_casexfrm
 #define UNIT uint16_t
diff --git a/lib/unicase/u32-casexfrm.c b/lib/unicase/u32-casexfrm.c
index bd54497b16..c65df72658 100644
--- a/lib/unicase/u32-casexfrm.c
+++ b/lib/unicase/u32-casexfrm.c
@@ -26,7 +26,7 @@
 
 #include "localcharset.h"
 #include "uniconv.h"
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #define FUNC u32_casexfrm
 #define UNIT uint32_t
diff --git a/lib/unicase/u8-casexfrm.c b/lib/unicase/u8-casexfrm.c
index b3e0c664ba..cd6f45ed48 100644
--- a/lib/unicase/u8-casexfrm.c
+++ b/lib/unicase/u8-casexfrm.c
@@ -26,7 +26,7 @@
 
 #include "localcharset.h"
 #include "uniconv.h"
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #define FUNC u8_casexfrm
 #define UNIT uint8_t
diff --git a/lib/uninorm/u-normxfrm.h b/lib/uninorm/u-normxfrm.h
index ce84ff675f..1e0e53da64 100644
--- a/lib/uninorm/u-normxfrm.h
+++ b/lib/uninorm/u-normxfrm.h
@@ -69,7 +69,7 @@ FUNC (const UNIT *s, size_t n, uninorm_t nf,
     }
 
   /* Apply locale dependent transformations for comparison.  */
-  result = memxfrm (convs, convs_length, resultbuf, lengthp);
+  result = amemxfrm (convs, convs_length, resultbuf, lengthp);
   if (result == NULL)
     {
       if (convs != convsbuf)
diff --git a/lib/uninorm/u16-normxfrm.c b/lib/uninorm/u16-normxfrm.c
index 41d274ab0b..d4af5ee33a 100644
--- a/lib/uninorm/u16-normxfrm.c
+++ b/lib/uninorm/u16-normxfrm.c
@@ -25,7 +25,7 @@
 
 #include "localcharset.h"
 #include "uniconv.h"
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #define FUNC u16_normxfrm
 #define UNIT uint16_t
diff --git a/lib/uninorm/u32-normxfrm.c b/lib/uninorm/u32-normxfrm.c
index 7e953f98ac..0d1629d763 100644
--- a/lib/uninorm/u32-normxfrm.c
+++ b/lib/uninorm/u32-normxfrm.c
@@ -25,7 +25,7 @@
 
 #include "localcharset.h"
 #include "uniconv.h"
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #define FUNC u32_normxfrm
 #define UNIT uint32_t
diff --git a/lib/uninorm/u8-normxfrm.c b/lib/uninorm/u8-normxfrm.c
index 47d4fdc0d9..2564f1cf9c 100644
--- a/lib/uninorm/u8-normxfrm.c
+++ b/lib/uninorm/u8-normxfrm.c
@@ -25,7 +25,7 @@
 
 #include "localcharset.h"
 #include "uniconv.h"
-#include "memxfrm.h"
+#include "amemxfrm.h"
 
 #define FUNC u8_normxfrm
 #define UNIT uint8_t