--- mstools/h/wcstr.h	2018/08/09 18:20:01	1.1.1.1
+++ mstools/h/wcstr.h	2018/08/09 18:20:33	1.1.1.2
@@ -1,54 +1,32 @@
 /***
 * wcstr.h - declarations for wide character string manipulation functions
 *
-*       Copyright (c) 1985-1991, Microsoft Corporation. All rights reserved.
+*       Copyright (c) 1985-1992, Microsoft Corporation. All rights reserved.
 *
 *Purpose:
 *       This file contains the function declarations for the string
 *       manipulation functions.
-*       [UNICODE/ISO]
+*       [OBSOLETE][UNICODE/ISO]
+*
+*	WARNING: OBSOLETE FILE: use wchar.h/stdlib.h instead!!!
+*	This file provided only for short-term compatibility.  It will
+*	disappear in the near future after a brief transitional period.
 *
 ****/
 
 #ifndef _INC_WCSTR
 
+#include <wchar.h>
+#define wcswcs wcsstr
 
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#define _SIZE_T_DEFINED
-#endif
-
-#ifndef _WCHAR_T_DEFINED
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
-#endif
-
-/* define NULL pointer value */
-
-#ifndef NULL
-#define NULL    ((void *)0)
+#define _wcscmpi _wcsicmp
+#if !__STDC__
+#define wcscmpi	_wcsicmp
 #endif
 
-
-/* function prototypes */
-
-wchar_t *wcscat(wchar_t *string1, const wchar_t *string2);
-wchar_t *wcschr(const wchar_t *string1, wchar_t character);
-int      wcscmp(const wchar_t *string1, const wchar_t *string2);
-wchar_t *wcscpy(wchar_t *string1, const wchar_t *string2);
-size_t   wcscspn(const wchar_t *string1, const wchar_t *string2);
-size_t   wcslen(const wchar_t *string);
-wchar_t *wcsncat(wchar_t *string1, const wchar_t *string2, size_t count);
-int      wcsncmp(const wchar_t *string1, const wchar_t *string2, size_t count);
-wchar_t *wcsncpy(wchar_t *string1, const wchar_t *string2, size_t count);
-wchar_t *wcspbrk(const wchar_t *string1, const wchar_t *string2);
-wchar_t *wcsrchr(const wchar_t *string, wchar_t character);
-size_t   wcsspn(const wchar_t *string1, const wchar_t *string2);
-wchar_t *wcswcs(const wchar_t *string1, const wchar_t *string2);
-int      wcstomb(char *string, wchar_t character);
-size_t   wcstombs(char *dest, const wchar_t *string, size_t count);
+/* from stdlib.h */
+int wctomb(char *, wchar_t);
+size_t wcstombs(char*, const wchar_t *, size_t);
 
 #define _INC_WCSTR
-
 #endif  /* _INC_WCSTR */