socsvn commit: r269663 - soc2014/ghostmansd/head/include

[ghostmansd at FreeBSD.org]

Author: ghostmansd
Date: Tue Jun 17 00:25:55 2014
New Revision: 269663
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269663

Log:
  string.h and wchar.h macro fixes
  

Modified:
  soc2014/ghostmansd/head/include/string.h
  soc2014/ghostmansd/head/include/wchar.h

Modified: soc2014/ghostmansd/head/include/string.h
==============================================================================
--- soc2014/ghostmansd/head/include/string.h	Mon Jun 16 23:38:41 2014	(r269662)
+++ soc2014/ghostmansd/head/include/string.h	Tue Jun 17 00:25:55 2014	(r269663)
@@ -142,24 +142,25 @@
 #endif
 
 /* Unicode Normalization algorithm */
-#define __NORM_NFD		0
-#define __NORM_NFC		1
-#define __NORM_NFKD		2
-#define __NORM_NFKC		3
-
+#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, char const*, int);
 size_t	__strnorm_l(char*, size_t, char const*, int, locale_t);
-size_t	__wcsnorm(wchar_t*, size_t, wchar_t const*, int);
 #ifdef _UNICODE_ADDENDA
 	#define strnorm 	__strnorm
 	#define wcsnorm		__wcsnorm
+#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	Mon Jun 16 23:38:41 2014	(r269662)
+++ soc2014/ghostmansd/head/include/wchar.h	Tue Jun 17 00:25:55 2014	(r269663)
@@ -227,6 +227,25 @@
 #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, wchar_t const*, 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_ */