1 files changed, 2 insertions, 101 deletions

diff --git a/usr/src/head/iso/wchar_iso.h b/usr/src/head/iso/wchar_iso.h
index 6830794381..14763f0165 100644
--- a/usr/src/head/iso/wchar_iso.h
+++ b/usr/src/head/iso/wchar_iso.h
@@ -20,15 +20,13 @@
  */
 
 /*
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ *
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*
- * Copyright 2014 Garrett D'Amore <garrett@damore.org>
- */
-
-/*
  * An application should not include this header directly.  Instead it
  * should be included only through the inclusion of other Sun headers.
  *
@@ -187,7 +185,6 @@ typedef __FILE FILE;
 #pragma redefine_extname fputws	__fputws_xpg5
 #pragma redefine_extname ungetwc	__ungetwc_xpg5
 #else	/* __PRAGMA_REDEFINE_EXTNAME */
-#ifdef __STDC__
 extern wint_t __fgetwc_xpg5(__FILE *);
 extern wint_t __getwc_xpg5(__FILE *);
 extern wint_t __getwchar_xpg5(void);
@@ -198,17 +195,6 @@ extern wchar_t *__fgetws_xpg5(wchar_t *_RESTRICT_KYWD, int,
 			__FILE *_RESTRICT_KYWD);
 extern int __fputws_xpg5(const wchar_t *_RESTRICT_KYWD, __FILE *_RESTRICT_KYWD);
 extern wint_t __ungetwc_xpg5(wint_t, __FILE *);
-#else
-extern wint_t __fgetwc_xpg5();
-extern wint_t __getwc_xpg5();
-extern wint_t __getwchar_xpg5();
-extern wint_t __fputwc_xpg5();
-extern wint_t __putwc_xpg5();
-extern wint_t __putwchar_xpg5();
-extern wchar_t *__fgetws_xpg5();
-extern int __fputws_xpg5();
-extern wint_t __ungetwc_xpg5();
-#endif	/* __STDC__ */
 #define	fgetwc	__fgetwc_xpg5
 #define	getwc	__getwc_xpg5
 #define	getwchar	__getwchar_xpg5
@@ -222,8 +208,6 @@ extern wint_t __ungetwc_xpg5();
 #endif /* not XPG4 and not XPG4v2 */
 #endif /* defined(_MSE_INT_H) */
 
-#ifdef __STDC__
-
 extern wint_t fgetwc(__FILE *);
 extern wchar_t *fgetws(wchar_t *_RESTRICT_KYWD, int, __FILE *_RESTRICT_KYWD);
 extern wint_t fputwc(wint_t, __FILE *);
@@ -360,89 +344,6 @@ extern wchar_t	*wmemchr(const wchar_t *, wchar_t, size_t);
 #endif /* __cplusplus >= 199711L */
 #endif /* not XPG4 and not XPG4v2 */
 
-#else /* __STDC__ */
-
-extern  wint_t fgetwc();
-extern  wchar_t *fgetws();
-extern  wint_t fputwc();
-extern  int fputws();
-extern  wint_t  ungetwc();
-extern wint_t getwc();
-extern wint_t getwchar();
-extern wint_t putwc();
-extern wint_t putwchar();
-extern wint_t ungetwc();
-extern double wcstod();
-extern long wcstol();
-extern unsigned long wcstoul();
-extern wchar_t *wcscat();
-extern wchar_t *wcschr();
-extern int wcscmp();
-extern int wcscoll();
-extern wchar_t *wcscpy();
-extern size_t wcscspn();
-extern size_t wcslen();
-extern wchar_t *wcsncat();
-extern int wcsncmp();
-extern wchar_t *wcsncpy();
-extern wchar_t *wcspbrk();
-extern wchar_t *wcsrchr();
-extern size_t wcsspn();
-extern size_t wcsxfrm();
-
-#if (!defined(_MSE_INT_H))
-#if defined(_XPG4) && !defined(_XPG5) /* XPG4 or XPG4v2 */
-extern wchar_t *wcstok();
-extern size_t wcsftime();
-#else	/* XPG4 or XPG4v2 */
-#ifdef __PRAGMA_REDEFINE_EXTNAME
-#pragma redefine_extname wcstok	__wcstok_xpg5
-#pragma redefine_extname wcsftime	__wcsftime_xpg5
-extern wchar_t *wcstok();
-extern size_t wcsftime();
-#else	/* __PRAGMA_REDEFINE_EXTNAME */
-extern wchar_t *__wcstok_xpg5();
-extern size_t __wcsftime_xpg5();
-#define	wcstok	__wcstok_xpg5
-#define	wcsftime	__wcsftime_xpg5
-#endif	/* __PRAGMA_REDEFINE_EXTNAME */
-#endif	/* XPG4 or XPG4v2 */
-#endif	/* defined(_MSE_INT_H) */
-
-/* not XPG4 and not XPG4v2 */
-#if (!defined(_XPG4) && !defined(_XPG4_2) || defined(_XPG5))
-extern wint_t	btowc();
-extern int	fwprintf();
-extern int	fwscanf();
-extern int	fwide();
-extern int	mbsinit();
-extern size_t	mbrlen();
-extern size_t	mbrtowc();
-extern size_t	mbsrtowcs();
-extern int	swprintf();
-extern int	swscanf();
-extern int	vfwprintf();
-extern int	vwprintf();
-extern int	vswprintf();
-extern size_t	wcrtomb();
-extern size_t	wcsrtombs();
-#if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
-extern size_t	wcsnrtombs();
-#endif
-
-extern wchar_t	*wcsstr();
-extern int	wctob();
-extern wchar_t	*wmemchr();
-extern int	wmemcmp();
-extern wchar_t	*wmemcpy();
-extern wchar_t	*wmemmove();
-extern wchar_t	*wmemset();
-extern int	wprintf();
-extern int	wscanf();
-#endif /* not XPG4 and not XPG4v2 */
-
-#endif /* __STDC__ */
-
 #if __cplusplus >= 199711L
 }
 #endif /* end of namespace std */