diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2012-02-14 21:48:46 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2012-02-14 21:48:46 +0000 |
commit | b74cf6dcf17dd06d3b530f7d4bec6191728f24b9 (patch) | |
tree | 00a985b9380f82c7f307d0bcf2af19ad578ceabb /include/xlocale/_string.h | |
parent | a40c00a535e3b71a50072880ef05e22b0cf2732b (diff) | |
download | src-b74cf6dcf17dd06d3b530f7d4bec6191728f24b9.tar.gz src-b74cf6dcf17dd06d3b530f7d4bec6191728f24b9.zip |
Revert r231673 and r231682 for now, until we can run a full make
universe with them. Sorry for the breakage.
Pointy hat to: me and brooks
Notes
Notes:
svn path=/head/; revision=231714
Diffstat (limited to 'include/xlocale/_string.h')
-rw-r--r-- | include/xlocale/_string.h | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/include/xlocale/_string.h b/include/xlocale/_string.h deleted file mode 100644 index 262728066c27..000000000000 --- a/include/xlocale/_string.h +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -/* - * This file is included from both string.h and xlocale.h. We need to expose - * the declarations unconditionally if we are included from xlocale.h, but only - * if we are in POSIX2008 mode if included from string.h. - */ - -#ifndef _XLOCALE_STRING1_H -#define _XLOCALE_STRING1_H - -/* - * POSIX2008 functions - */ -int strcoll_l(const char *, const char *, locale_t); -size_t strxfrm_l(char *, const char *, size_t, locale_t); -#endif /* _XLOCALE_STRING1_H */ - -/* - * xlocale extensions - */ -#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_ */ |