Finished obsoleting interfaces for XPG7.

@@ -118,12 +118,10 @@
 #if defined(_XPG6) && !defined(_VA_LIST)
 #define _VA_LIST
 typedef __va_list va_list;
 #endif  /* defined(_XPG6) && !defined(_VA_LIST) */
 
-#ifdef __STDC__
-
 #if !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__)
 #if __cplusplus >= 199711L
 namespace std {
 #endif
 extern int iswalpha(wint_t);

@@ -138,11 +136,13 @@
 extern int iswgraph(wint_t);
 extern int iswcntrl(wint_t);
 extern int iswctype(wint_t, wctype_t);
 extern wint_t towlower(wint_t);
 extern wint_t towupper(wint_t);
+#ifndef _STRICT_XPG7
 extern wchar_t *wcswcs(const wchar_t *, const wchar_t *);
+#endif
 extern int wcswidth(const wchar_t *, size_t);
 extern int wcwidth(wchar_t);
 extern wctype_t wctype(const char *);
 #if __cplusplus >= 199711L
 } /* namespace std */

@@ -159,11 +159,13 @@
 using std::iswgraph;
 using std::iswcntrl;
 using std::iswctype;
 using std::towlower;
 using std::towupper;
+#ifndef _STRICT_XPG7
 using std::wcswcs;
+#endif
 using std::wcswidth;
 using std::wcwidth;
 using std::wctype;
 #endif
 #endif /* !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE)... */

@@ -190,49 +192,10 @@
 extern size_t mbsnrtowcs(wchar_t *_RESTRICT_KYWD, const char **_RESTRICT_KYWD,
     size_t, size_t, mbstate_t *_RESTRICT_KYWD);
 
 #endif  /* defined(_XPG7) || !defined(_STRICT_SYMBOLS) */
 
-#else /* __STDC__ */
-
-#if !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__)
-extern  int iswalpha();
-extern  int iswupper();
-extern  int iswlower();
-extern  int iswdigit();
-extern  int iswxdigit();
-extern  int iswalnum();
-extern  int iswspace();
-extern  int iswpunct();
-extern  int iswprint();
-extern  int iswgraph();
-extern  int iswcntrl();
-extern  int iswctype();
-extern  wint_t towlower();
-extern  wint_t towupper();
-extern wchar_t *wcswcs();
-extern int wcswidth();
-extern int wcwidth();
-extern wctype_t wctype();
-#endif /* !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE)... */
-
-#if defined(_XGP7) || !defined(_STRICT_SYMBOLS)
-extern size_t wcsnlen();
-extern wchar_t *wcpcpy();
-extern wchar_t *wcpncpy();
-extern size_t wcsxfrm_l();
-extern int wcscoll_l();
-extern wchar_t *wcsdup();
-extern int wcscasecmp();
-extern int wcscasecmp_l();
-extern int wcsncasecmp();
-extern int wcsncasecmp_l();
-extern size_t mbsnrtowcs();
-#endif
-
-#endif /* __STDC__ */
-
 #ifdef  __cplusplus
 }
 #endif
 
 #endif  /* _WCHAR_H */