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

1 files changed, 0 insertions, 44 deletions

diff --git a/include/xlocale/_inttypes.h b/include/xlocale/_inttypes.h
deleted file mode 100644
index 58e434ecf3d5..000000000000
--- a/include/xlocale/_inttypes.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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$
- */
-
-
-/*
- * Extended locale versions of the locale-aware functions from inttypes.h.
- * Include <inttypes.h> before <xlocale.h> to expose these.
- */
-intmax_t	strtoimax_l(const char * __restrict, char ** __restrict,
-		    int, locale_t);
-uintmax_t	strtoumax_l(const char * __restrict, char ** __restrict, int,
-		    locale_t);
-intmax_t	wcstoimax_l(const wchar_t * __restrict, wchar_t ** __restrict,
-		    int , locale_t);
-uintmax_t	wcstoumax_l(const wchar_t * __restrict, wchar_t ** __restrict,
-		    int, locale_t);