[PATCH] Remove CopyISOLatin1Lowered

Yaakov (Cygwin/X) yselkowitz at users.sourceforge.net
Thu Oct 15 02:24:25 PDT 2009


From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

This function was moved verbatim into libXfont-1.4, and it is not used 
by the server or any drivers.  Exporting it in both places leads to 
multiple definition linking errors on Cygwin, where we need to use a 
static libXfont due to poor weak-symbol handling.

Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
 dix/dixutils.c |   10 ----------
 include/dix.h  |    5 -----
 2 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/dix/dixutils.c b/dix/dixutils.c
index 5cede5f..8278d44 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -165,16 +165,6 @@ ISOLatin1ToLower (unsigned char source)
 }
 
 
-void
-CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
-{
-    int i;
-
-    for (i = 0; i < length; i++, source++, dest++)
-	*dest = ISOLatin1ToLower (*source);
-    *dest = '\0';
-}
-
 int
 CompareISOLatin1Lowered(unsigned char *s1, int s1len, 
 			unsigned char *s2, int s2len)
diff --git a/include/dix.h b/include/dix.h
index 9fd2ed8..ed3acb6 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -173,11 +173,6 @@ extern _X_EXPORT void MarkClientException(
 extern _X_HIDDEN Bool CreateConnectionBlock(void);
 /* dixutils.c */
 
-extern _X_EXPORT void CopyISOLatin1Lowered(
-    unsigned char * /*dest*/,
-    unsigned char * /*source*/,
-    int /*length*/);
-
 extern _X_EXPORT int CompareISOLatin1Lowered(
     unsigned char * /*a*/,
     int alen,
-- 
1.6.4.2



More information about the xorg-devel mailing list