Date: Fri, 1 Aug 2014 23:47:03 GMT From: ghostmansd@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271717 - in soc2014/ghostmansd/head: include lib/libc/string lib/libc/string/coll lib/libc/string/norm Message-ID: <201408012347.s71Nl30P075735@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ghostmansd Date: Fri Aug 1 23:47:02 2014 New Revision: 271717 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271717 Log: rolled back to r269634 Deleted: soc2014/ghostmansd/head/lib/libc/string/coll/ soc2014/ghostmansd/head/lib/libc/string/coll.h soc2014/ghostmansd/head/lib/libc/string/norm/ soc2014/ghostmansd/head/lib/libc/string/norm.h soc2014/ghostmansd/head/lib/libc/string/strnorm.3 soc2014/ghostmansd/head/lib/libc/string/strnorm.c soc2014/ghostmansd/head/lib/libc/string/wcsnorm.3 soc2014/ghostmansd/head/lib/libc/string/wcsnorm.c Modified: soc2014/ghostmansd/head/include/string.h soc2014/ghostmansd/head/include/wchar.h soc2014/ghostmansd/head/lib/libc/string/Makefile.inc Modified: soc2014/ghostmansd/head/include/string.h ============================================================================== --- soc2014/ghostmansd/head/include/string.h Fri Aug 1 22:56:41 2014 (r271716) +++ soc2014/ghostmansd/head/include/string.h Fri Aug 1 23:47:02 2014 (r271717) @@ -36,7 +36,6 @@ #include <sys/cdefs.h> #include <sys/_null.h> #include <sys/_types.h> -#include <xlocale.h> /* * Prototype functions which were historically defined in <string.h>, but @@ -140,30 +139,6 @@ #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) #include <xlocale/_string.h> #endif - - -/* Unicode Normalization algorithm */ -#ifndef _WCHAR_H_ -#define __NORM_NFD 0 -#define __NORM_NFC 1 -#define __NORM_NFKD 2 -#define __NORM_NFKC 3 -#endif - -size_t __strnorm(char*, size_t, const char*, int); -size_t __strnorm_l(char*, size_t, const char*, int, locale_t); - -#ifdef _UNICODE_ADDENDA -#define strnorm __strnorm -#define strnorn_l __strnorm_l -#endif - -#if !defined(_WCHAR_H_) && defined(_UNICODE_ADDENDA) -#define NORM_NFD __NORM_NFD -#define NORM_NFC __NORM_NFC -#define NORM_NFKD __NORM_NFKD -#define NORM_NFKC __NORM_NFKC -#endif __END_DECLS #endif /* _STRING_H_ */ Modified: soc2014/ghostmansd/head/include/wchar.h ============================================================================== --- soc2014/ghostmansd/head/include/wchar.h Fri Aug 1 22:56:41 2014 (r271716) +++ soc2014/ghostmansd/head/include/wchar.h Fri Aug 1 23:47:02 2014 (r271717) @@ -227,28 +227,6 @@ #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) #include <xlocale/_wchar.h> #endif - - -/* Unicode Normalization Algorithm */ -#ifndef _STRING_H_ -#define __NORM_NFD 0 -#define __NORM_NFC 1 -#define __NORM_NFKD 2 -#define __NORM_NFKC 3 -#endif - -size_t __wcsnorm(wchar_t*, size_t, const wchar_t*, int); - -#ifdef _UNICODE_ADDENDA -#define wcscoll __wcscoll -#endif - -#if !defined(_STRING_H_) && defined(_UNICODE_ADDENDA) -#define NORM_NFD __NORM_NFD -#define NORM_NFC __NORM_NFC -#define NORM_NFKD __NORM_NFKD -#define NORM_NFKC __NORM_NFKC -#endif __END_DECLS #endif /* !_WCHAR_H_ */ Modified: soc2014/ghostmansd/head/lib/libc/string/Makefile.inc ============================================================================== --- soc2014/ghostmansd/head/lib/libc/string/Makefile.inc Fri Aug 1 22:56:41 2014 (r271716) +++ soc2014/ghostmansd/head/lib/libc/string/Makefile.inc Fri Aug 1 23:47:02 2014 (r271717) @@ -21,7 +21,6 @@ wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wcsxfrm.c wmemchr.c \ wmemcmp.c \ wmemcpy.c wmemmove.c wmemset.c -MISRCS+=strnorm.c wcsnorm.c SYM_MAPS+= ${LIBC_SRCTOP}/string/Symbol.map @@ -29,13 +28,12 @@ # machine-dependent string sources .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/string/Makefile.inc" -MAN+=bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ +MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 strcasecmp.3 strcat.3 \ strchr.3 strcmp.3 strcoll.3 strcpy.3 strdup.3 strerror.3 \ string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strsep.3 \ strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \ wcswidth.3 wcsxfrm.3 wmemchr.3 -MAN+=strnorm.3 wcsnorm.3 MLINKS+=ffs.3 ffsl.3 \ ffs.3 ffsll.3 \ @@ -93,4 +91,3 @@ wmemchr.3 wmemcpy.3 \ wmemchr.3 wmemmove.3 \ wmemchr.3 wmemset.3 -MLINKS+=strnorm.3 wcsnorm.3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408012347.s71Nl30P075735>