tchar.h: use std names

Dimitrie O. Paun dpaun at rogers.com
Sun Jan 5 18:33:27 CST 2003


There are a bunch of symbols (like _strinc, _strlwr, etc.) that
don't have equivalent in Unix. I don't know about Cygwin.
Do we do anything about those?

ChangeLog
  Use the standard symbol names instead of the msvcrt specific ones.

Index: include/tchar.h
===================================================================
RCS file: /var/cvs/wine/include/tchar.h,v
retrieving revision 1.19
diff -u -r1.19 tchar.h
--- include/tchar.h	4 Jan 2003 00:52:20 -0000	1.19
+++ include/tchar.h	5 Jan 2003 07:02:28 -0000
@@ -73,7 +73,7 @@
 #define _getts        WINE_tchar_routine(gets,            gets,        getws)
 #define _isalnum      WINE_tchar_routine(isalnum,         _ismbcalnum, iswalnum)
 #define _istalpha     WINE_tchar_routine(isalpha,         _ismbcalpha, iswalpha)
-#define _istascii     WINE_tchar_routine(__isascii,       __isascii,   iswascii)
+#define _istascii     WINE_tchar_routine(isascii,         __isascii,   iswascii)
 #define _istcntrl     WINE_tchar_routine(iscntrl,         iscntrl,     iswcntrl)
 #define _istdigit     WINE_tchar_routine(isdigit,         _ismbcdigit, iswdigit)
 #define _istgraph     WINE_tchar_routine(isgraph,         _ismbcgraph, iswgraph)
@@ -94,13 +94,13 @@
 #define _sntprintf    WINE_tchar_routine(sprintf,         sprintf,     swprintf)
 #define _stprintf     WINE_tchar_routine(sprintf,         sprintf,     swprintf)
 #define _stscanf      WINE_tchar_routine(sscanf,          sscanf,      swscanf)
-#define _taccess      WINE_tchar_routine(_access,         _access,     _waccess)
+#define _taccess      WINE_tchar_routine(access,          _access,     _waccess)
 #define _tasctime     WINE_tchar_routine(asctime,         asctime,     _wasctime)
 #define _tccpy        WINE_tchar_routine(WINE_tchar_tccpy,_mbccpy,     WINE_tchar_tccpy)
-#define _tchdir       WINE_tchar_routine(_chdir,          _chdir,      _wchdir)
+#define _tchdir       WINE_tchar_routine(chdir,           _chdir,      _wchdir)
 #define _tclen        WINE_tchar_routine(WINE_tchar_tclen,_mbclen,     WINE_tchar_tclen)
-#define _tchmod       WINE_tchar_routine(_chmod,          _chmod,      _wchmod)
-#define _tcreat       WINE_tchar_routine(_creat,          _creat,      _wcreat)
+#define _tchmod       WINE_tchar_routine(chmod,           _chmod,      _wchmod)
+#define _tcreat       WINE_tchar_routine(creat,           _creat,      _wcreat)
 #define _tcscat       WINE_tchar_routine(strcat,          _mbscat,     wcscat)
 #define _tcschr       WINE_tchar_routine(strchr,          _mbschr,     wcschr)
 #define _tcsclen      WINE_tchar_routine(strlen,          _mbslen,     wcslen)
@@ -109,9 +109,9 @@
 #define _tcscpy       WINE_tchar_routine(strcpy,          _mbscpy,     wcscpy)
 #define _tcscspn      WINE_tchar_routine(strcspn,         _mbscspn,    wcscspn)
 #define _tcsdec       WINE_tchar_routine(_strdec,         _mbsdec,     _wcsdec)
-#define _tcsdup       WINE_tchar_routine(_strdup,         _mbsdup,     _wcsdup)
+#define _tcsdup       WINE_tchar_routine(strdup,          _mbsdup,     _wcsdup)
 #define _tcsftime     WINE_tchar_routine(strftime,        strftime,    wcsftime)
-#define _tcsicmp      WINE_tchar_routine(_stricmp,        _mbsicmp,    _wcsicmp)
+#define _tcsicmp      WINE_tchar_routine(strcasecmp,      _mbsicmp,    _wcsicmp)
 #define _tcsicoll     WINE_tchar_routine(_stricoll,       _stricoll,   _wcsicoll)
 #define _tcsinc       WINE_tchar_routine(_strinc,         _mbsinc,     _wcsinc)
 #define _tcslen       WINE_tchar_routine(strlen,          strlen,      wcslen)
@@ -147,38 +147,38 @@
 #define _tcsxfrm      WINE_tchar_routine(strxfrm,         strxfrm,     wcsxfrm)
 #define _tctime       WINE_tchar_routine(ctime,           ctime,       _wctime)
 #define _tenviron     WINE_tchar_routine(_environ,        _environ,    _wenviron)
-#define _texecl       WINE_tchar_routine(_execl,          _execl,      _wexecl)
-#define _texecle      WINE_tchar_routine(_execle,         _execle,     _wexecle)
-#define _texeclp      WINE_tchar_routine(_execlp,         _execlp,     _wexeclp)
-#define _texeclpe     WINE_tchar_routine(_execlpe,        _execlpe,    _wexeclpe)
-#define _texecv       WINE_tchar_routine(_execv,          _execv,      _wexecv)
-#define _texecve      WINE_tchar_routine(_execve,         _execve,     _wexecve)
-#define _texecvp      WINE_tchar_routine(_execvp,         _execvp,     _wexecvp)
-#define _texecvpe     WINE_tchar_routine(_execvpe,        _execvpe,    _wexecvpe)
-#define _tfdopen      WINE_tchar_routine(_fdopen,         _fdopen,     _wfdopen)
+#define _texecl       WINE_tchar_routine(execl,           _execl,      _wexecl)
+#define _texecle      WINE_tchar_routine(execle,          _execle,     _wexecle)
+#define _texeclp      WINE_tchar_routine(execlp,          _execlp,     _wexeclp)
+#define _texeclpe     WINE_tchar_routine(execlpe,         _execlpe,    _wexeclpe)
+#define _texecv       WINE_tchar_routine(execv,           _execv,      _wexecv)
+#define _texecve      WINE_tchar_routine(execve,          _execve,     _wexecve)
+#define _texecvp      WINE_tchar_routine(execvp,          _execvp,     _wexecvp)
+#define _texecvpe     WINE_tchar_routine(execvpe,         _execvpe,    _wexecvpe)
+#define _tfdopen      WINE_tchar_routine(fdopen,          _fdopen,     _wfdopen)
 #define _tfinddata_t  WINE_tchar_routine(_finddata_t,     _finddata_t, _wfinddata_t)
 #define _tfinddatai64_t WINE_tchar_routine(_finddatai64_t,_finddatai64_t,_wfinddatai64_t)
-#define _tfindfirst   WINE_tchar_routine(_findfirst,      _findfirst,  _wfindfirst)
-#define _tfindnext    WINE_tchar_routine(_findnext,       _findnext,   _wfindnext)
+#define _tfindfirst   WINE_tchar_routine(findfirst,       _findfirst,  _wfindfirst)
+#define _tfindnext    WINE_tchar_routine(findnext,        _findnext,   _wfindnext)
 #define _tfopen       WINE_tchar_routine(fopen,           fopen,       _wfopen)
 #define _tfreopen     WINE_tchar_routine(freopen,         freopen,     _wfreopen)
 #define _tfsopen      WINE_tchar_routine(_fsopen,         _fsopen,     _wfsopen)
 #define _tfullpath    WINE_tchar_routine(_fullpath,       _fullpath,   _wfullpath)
-#define _tgetcwd      WINE_tchar_routine(_getcwd,         _getcwd,     _wgetcwd)
+#define _tgetcwd      WINE_tchar_routine(getcwd,          _getcwd,     _wgetcwd)
 #define _tgetenv      WINE_tchar_routine(getenv,          getenv,      _wgetenv)
 #define _tmain        WINE_tchar_routine(main,            main,        wmain)
 #define _tmakepath    WINE_tchar_routine(_makepath,       _makepath,   _wmakepath)
-#define _tmkdir       WINE_tchar_routine(_mkdir,          _mkdir,      _wmkdir)
-#define _tmktemp      WINE_tchar_routine(_mktemp,         _mktemp,     _wmktemp)
+#define _tmkdir       WINE_tchar_routine(mkdir,           _mkdir,      _wmkdir)
+#define _tmktemp      WINE_tchar_routine(mktemp,          _mktemp,     _wmktemp)
 #define _tperror      WINE_tchar_routine(perror,          perror,      _wperror)
-#define _topen        WINE_tchar_routine(_open,           _open,       _wopen)
+#define _topen        WINE_tchar_routine(open,            _open,       _wopen)
 #define _totlower     WINE_tchar_routine(tolower,         _mbctolower, towlower)
 #define _totupper     WINE_tchar_routine(toupper,         _mbctoupper, towupper)
-#define _tpopen       WINE_tchar_routine(_popen,          _popen,      _wpopen)
+#define _tpopen       WINE_tchar_routine(popen,           _popen,      _wpopen)
 #define _tprintf      WINE_tchar_routine(printf,          printf,      wprintf)
 #define _tremove      WINE_tchar_routine(remove,          remove,      _wremove)
 #define _trename      WINE_tchar_routine(rename,          rename,      _wrename)
-#define _trmdir       WINE_tchar_routine(_rmdir,          _rmdir,      _wrmdir)
+#define _trmdir       WINE_tchar_routine(rmdir,           _rmdir,      _wrmdir)
 #define _tsearchenv   WINE_tchar_routine(_searchenv,      _searchenv,  _wsearchenv)
 #define _tscanf       WINE_tchar_routine(scanf,           scanf,       wscanf)
 #define _tsetlocale   WINE_tchar_routine(setlocale,       setlocale,   _wsetlocale)
@@ -196,16 +196,16 @@
 #define _tstrdate     WINE_tchar_routine(_strdate,        _strdate,    _wstrdate)
 #define _tstrtime     WINE_tchar_routine(_strtime,        _strtime,    _wstrtime)
 #define _tsystem      WINE_tchar_routine(system,          system,      _wsystem)
-#define _ttempnam     WINE_tchar_routine(_tempnam,        _tempnam,    _wtempnam)
+#define _ttempnam     WINE_tchar_routine(tempnam,         _tempnam,    _wtempnam)
 #define _ttmpnam      WINE_tchar_routine(tmpnam,          tmpnam,      _wtmpnam)
 #define _ttoi         WINE_tchar_routine(atoi,            atoi,        _wtoi)
 #define _ttol         WINE_tchar_routine(atol,            atol,        _wtol)
-#define _tutime       WINE_tchar_routine(_utime,          _utime,      _wutime)
+#define _tutime       WINE_tchar_routine(utime,           _utime,      _wutime)
 #define _tWinMain     WINE_tchar_routine(WinMain,         WinMain,     wWinMain)
 #define _ultot        WINE_tchar_routine(_ultoa,          _ultoa,      _ultow)
 #define _ungettc      WINE_tchar_routine(ungetc,          ungetc,      ungetwc)
 #define _vftprintf    WINE_tchar_routine(vfprintf,        vfprintf,    vfwprintf)
-#define _vsntprintf   WINE_tchar_routine(_vsnprintf,      _vsnprintf,  _vsnwprintf)
+#define _vsntprintf   WINE_tchar_routine(vsnprintf,       _vsnprintf,  _vsnwprintf)
 #define _vstprintf    WINE_tchar_routine(vsprintf,        vsprintf,    vswprintf)
 #define _vtprintf     WINE_tchar_routine(vprintf,         vprintf,     vwprintf)
 #define _TEOF         WINE_tchar_routine(EOF,             EOF,         WEOF)

-- 
Dimi.




More information about the wine-patches mailing list