From c4efb32c7e236bd9218b98c665199dd3ba44bfe8 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@codeweavers.com>
Date: Mon, 23 Apr 2001 18:23:00 +0000
Subject: [PATCH] Prevent use by Wine's source. Added missing 'function'
 definitions (macros really).

---
 include/tchar.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/tchar.h b/include/tchar.h
index 475a5646986..4685af033ce 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -1,6 +1,10 @@
 #ifndef __WINE_TCHAR_H
 #define __WINE_TCHAR_H
 
+#ifdef __WINE__
+#error Wine should not include tchar.h internally
+#endif
+
 #include "windef.h"
 
 #ifdef __cplusplus
@@ -10,10 +14,12 @@ extern "C" {
 /*****************************************************************************
  * tchar routines
  */
-#define _strdec(start,current)  (start<current?((char*)current)-1:NULL)
-#define _strinc(current) (((char*)current)+1)
-/* FIXME: _strncnt and strncnt are missing */
-/* FIXME: _strspnp is not implemented */
+#define _strdec(start,current)  ((start)<(current) ? ((char*)(current))-1 : NULL)
+#define _strinc(current)        (((char*)(current))+1)
+#define _strncnt(str,max)       (strlen(str)>(max) ? (max) : strlen(str))
+#define _strnextc(str)          ((unsigned int)*(str))
+#define _strninc(str,n)         (((char*)(str))+(n))
+#define _strspnp(s1,s2)         (*((s1)+=strspn((s1),(s2))) ? (s1) : NULL)
 
 
 /*****************************************************************************