Adam Tkac | 3318a41 | 2010-09-15 11:42:54 +0000 | [diff] [blame] | 1 | From 7c31dd5db8b43c7796bf97a07e08213af5afd2ae Mon Sep 17 00:00:00 2001 |
| 2 | From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> |
| 3 | Date: Thu, 15 Oct 2009 04:24:25 -0500 |
| 4 | Subject: [PATCH] Remove CopyISOLatin1Lowered |
| 5 | |
| 6 | This function was moved verbatim into libXfont-1.4, and it is not used |
| 7 | by the server or any drivers. Exporting it in both places leads to |
| 8 | multiple definition linking errors on Cygwin, where we need to use a |
| 9 | static libXfont due to poor weak-symbol handling. |
| 10 | |
| 11 | Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> |
| 12 | Signed-off-by: Keith Packard <keithp@keithp.com> |
| 13 | Signed-off-by: Adam Tkac <atkac@redhat.com> |
| 14 | --- |
| 15 | dix/dixutils.c | 10 ---------- |
| 16 | include/dix.h | 5 ----- |
| 17 | 2 files changed, 0 insertions(+), 15 deletions(-) |
| 18 | |
| 19 | diff --git a/dix/dixutils.c b/dix/dixutils.c |
| 20 | index 5cede5f..8278d44 100644 |
| 21 | --- a/dix/dixutils.c |
| 22 | +++ b/dix/dixutils.c |
| 23 | @@ -165,16 +165,6 @@ ISOLatin1ToLower (unsigned char source) |
| 24 | } |
| 25 | |
| 26 | |
| 27 | -void |
| 28 | -CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) |
| 29 | -{ |
| 30 | - int i; |
| 31 | - |
| 32 | - for (i = 0; i < length; i++, source++, dest++) |
| 33 | - *dest = ISOLatin1ToLower (*source); |
| 34 | - *dest = '\0'; |
| 35 | -} |
| 36 | - |
| 37 | int |
| 38 | CompareISOLatin1Lowered(unsigned char *s1, int s1len, |
| 39 | unsigned char *s2, int s2len) |
| 40 | diff --git a/include/dix.h b/include/dix.h |
| 41 | index 9fd2ed8..ed3acb6 100644 |
| 42 | --- a/include/dix.h |
| 43 | +++ b/include/dix.h |
| 44 | @@ -173,11 +173,6 @@ extern _X_EXPORT void MarkClientException( |
| 45 | extern _X_HIDDEN Bool CreateConnectionBlock(void); |
| 46 | /* dixutils.c */ |
| 47 | |
| 48 | -extern _X_EXPORT void CopyISOLatin1Lowered( |
| 49 | - unsigned char * /*dest*/, |
| 50 | - unsigned char * /*source*/, |
| 51 | - int /*length*/); |
| 52 | - |
| 53 | extern _X_EXPORT int CompareISOLatin1Lowered( |
| 54 | unsigned char * /*a*/, |
| 55 | int alen, |
| 56 | -- |
| 57 | 1.7.2.3 |
| 58 | |