Module: wine Branch: master Commit: 26ffc40bfb42b7c05ce9513bf479e31eb85294b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ffc40bfb42b7c05ce9513bf...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Mar 9 17:53:42 2020 +0100
include: Add corecrt_wdirect.h header.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/Makefile.in | 1 + include/msvcrt/corecrt_wdirect.h | 25 +++++++++++++++++++++++++ include/msvcrt/direct.h | 11 +---------- include/msvcrt/wchar.h | 10 +--------- 4 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/include/Makefile.in b/include/Makefile.in index 54bd7e2825..adcd173a14 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -427,6 +427,7 @@ SOURCES = \ msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ + msvcrt/corecrt_wdirect.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wprocess.h \ msvcrt/corecrt_wstdio.h \ diff --git a/include/msvcrt/corecrt_wdirect.h b/include/msvcrt/corecrt_wdirect.h new file mode 100644 index 0000000000..88abae560c --- /dev/null +++ b/include/msvcrt/corecrt_wdirect.h @@ -0,0 +1,25 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WDIRECT_DEFINED +#define _WDIRECT_DEFINED + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +int __cdecl _wchdir(const wchar_t*); +wchar_t* __cdecl _wgetcwd(wchar_t*,int); +wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); +int __cdecl _wmkdir(const wchar_t*); +int __cdecl _wrmdir(const wchar_t*); + +#ifdef __cplusplus +} +#endif + +#endif /* _WDIRECT_DEFINED */ diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h index 312cb2d365..90c6103e4d 100644 --- a/include/msvcrt/direct.h +++ b/include/msvcrt/direct.h @@ -8,7 +8,7 @@ #ifndef __WINE_DIRECT_H #define __WINE_DIRECT_H
-#include <corecrt.h> +#include <corecrt_wdirect.h>
#include <pshpack8.h>
@@ -35,15 +35,6 @@ __msvcrt_ulong __cdecl _getdrives(void); int __cdecl _mkdir(const char*); int __cdecl _rmdir(const char*);
-#ifndef _WDIRECT_DEFINED -#define _WDIRECT_DEFINED -int __cdecl _wchdir(const wchar_t*); -wchar_t* __cdecl _wgetcwd(wchar_t*,int); -wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); -int __cdecl _wmkdir(const wchar_t*); -int __cdecl _wrmdir(const wchar_t*); -#endif /* _WDIRECT_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index ddb0fc5bc1..fcf198f9b2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -9,6 +9,7 @@ #define __WINE_WCHAR_H
#include <corecrt_wctype.h> +#include <corecrt_wdirect.h> #include <corecrt_wio.h> #include <corecrt_wprocess.h> #include <corecrt_wstdio.h> @@ -28,15 +29,6 @@ extern "C" {
typedef int mbstate_t;
-#ifndef _WDIRECT_DEFINED -#define _WDIRECT_DEFINED -int __cdecl _wchdir(const wchar_t*); -wchar_t* __cdecl _wgetcwd(wchar_t*,int); -wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int); -int __cdecl _wmkdir(const wchar_t*); -int __cdecl _wrmdir(const wchar_t*); -#endif /* _WDIRECT_DEFINED */ - #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED wchar_t* __cdecl _wsetlocale(int,const wchar_t*);