[Midnightbsd-cvs] src [10670] trunk/include/xlocale: sync

[laffer1 at midnightbsd.org]

Revision: 10670
          http://svnweb.midnightbsd.org/src/?rev=10670
Author:   laffer1
Date:     2018-06-09 15:44:30 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/include/xlocale/Makefile
    trunk/include/xlocale/_locale.h
    trunk/include/xlocale/_string.h

Modified: trunk/include/xlocale/Makefile
===================================================================
--- trunk/include/xlocale/Makefile	2018-06-09 19:42:44 UTC (rev 10669)
+++ trunk/include/xlocale/Makefile	2018-06-09 19:44:30 UTC (rev 10670)
@@ -1,8 +1,9 @@
-# $MidnightBSD$ 
+# $MidnightBSD$
+# $FreeBSD: stable/10/include/xlocale/Makefile 267465 2014-06-14 02:57:40Z pfg $ 
 
 NO_OBJ=
 INCS=	_ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\
-	_stdlib.h _string.h _time.h _wchar.h
+	_stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h
 INCSDIR=${INCLUDEDIR}/xlocale
 
 .include <bsd.prog.mk>

Modified: trunk/include/xlocale/_locale.h
===================================================================
--- trunk/include/xlocale/_locale.h	2018-06-09 19:42:44 UTC (rev 10669)
+++ trunk/include/xlocale/_locale.h	2018-06-09 19:44:30 UTC (rev 10670)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2011, 2012 The FreeBSD Foundation
  * All rights reserved.
@@ -26,18 +27,19 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/include/xlocale/_locale.h 304862 2016-08-26 21:19:23Z ache $
  */
 
 #ifndef _XLOCALE_LOCALE_H
 #define _XLOCALE_LOCALE_H
 
+/* Bit shifting order of LC_*_MASK should match XLC_* and LC_* order. */
 #define LC_COLLATE_MASK  (1<<0)
 #define LC_CTYPE_MASK    (1<<1)
-#define LC_MESSAGES_MASK (1<<2)
-#define LC_MONETARY_MASK (1<<3)
-#define LC_NUMERIC_MASK  (1<<4)
-#define LC_TIME_MASK     (1<<5)
+#define LC_MONETARY_MASK (1<<2)
+#define LC_NUMERIC_MASK  (1<<3)
+#define LC_TIME_MASK     (1<<4)
+#define LC_MESSAGES_MASK (1<<5)
 #define LC_ALL_MASK      (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | \
 			  LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK)
 #define LC_GLOBAL_LOCALE ((locale_t)-1)

Modified: trunk/include/xlocale/_string.h
===================================================================
--- trunk/include/xlocale/_string.h	2018-06-09 19:42:44 UTC (rev 10669)
+++ trunk/include/xlocale/_string.h	2018-06-09 19:44:30 UTC (rev 10670)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2011, 2012 The FreeBSD Foundation
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/include/xlocale/_string.h 267465 2014-06-14 02:57:40Z pfg $
  */
 
 #ifndef _LOCALE_T_DEFINED
@@ -53,9 +54,7 @@
 #ifdef _XLOCALE_H_
 #ifndef _XLOCALE_STRING2_H
 #define _XLOCALE_STRING2_H
-int	 strcasecmp_l(const char *, const char *, locale_t);
 char	*strcasestr_l(const char *, const char *, locale_t);
-int	 strncasecmp_l(const char *, const char *, size_t, locale_t);
 
 #endif /* _XLOCALE_STRING2_H */
 #endif /* _XLOCALE_H_ */