From: Frank Lahm <franklahm@googlemail.com>
Date: Tue, 3 Jan 2012 14:26:39 +0000 (+0100)
Subject: Merge master
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=7be2a68aa70fa5641e944ad0aed6f699736d3de9

Merge master
---

7be2a68aa70fa5641e944ad0aed6f699736d3de9
diff --cc libatalk/unicode/util_unistr.c
index 3c9a194b,decd8c0a..e5ea4ba0
--- a/libatalk/unicode/util_unistr.c
+++ b/libatalk/unicode/util_unistr.c
@@@ -192,7 -192,7 +191,7 @@@ ucs2_t *strcasechr_sp(const ucs2_t *s, 
  {
  	if (*s == 0) return NULL;
  	while (s[1] != 0) {
- 		if (toupper_sp(c_sp) == toupper_sp((uint32_t)*s << 16 | (uint32_t)s[1])) return (ucs2_t *)s;
 -		if (tolower_sp(c_sp) == tolower_sp((u_int32_t)*s << 16 | (u_int32_t)s[1])) return (ucs2_t *)s;
++		if (tolower_sp(c_sp) == tolower_sp((uint32_t)*s << 16 | (uint32_t)s[1])) return (ucs2_t *)s;
  		s++;
  	}