Don't use wine/unicode.h in the header files, include it directly

where needed instead.
This commit is contained in:
Patrik Stridvall 2002-10-23 20:20:59 +00:00 committed by Alexandre Julliard
parent da93e83b90
commit cf07e10017
10 changed files with 21 additions and 8 deletions

View File

@ -26,7 +26,9 @@
#include "heap.h" #include "heap.h"
#include "winternl.h" #include "winternl.h"
#include "ntsecapi.h" #include "ntsecapi.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(advapi); WINE_DEFAULT_DEBUG_CHANNEL(advapi);

View File

@ -133,7 +133,9 @@
#include "heap.h" #include "heap.h"
#include "commctrl.h" #include "commctrl.h"
#include "comctl32.h" #include "comctl32.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(listview); WINE_DEFAULT_DEBUG_CHANNEL(listview);

View File

@ -42,6 +42,7 @@
#include "shell32_main.h" #include "shell32_main.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);

View File

@ -56,6 +56,15 @@ static DOS_FULL_NAME DIR_System;
static const WCHAR wineW[] = {'w','i','n','e',0}; static const WCHAR wineW[] = {'w','i','n','e',0};
/***********************************************************************
* FILE_contains_pathW
*/
inline static int FILE_contains_pathW (LPCWSTR name)
{
return ((*name && (name[1] == ':')) ||
strchrW (name, '/') || strchrW (name, '\\'));
}
/*********************************************************************** /***********************************************************************
* DIR_GetPath * DIR_GetPath
* *

View File

@ -28,7 +28,6 @@
#include <sys/types.h> #include <sys/types.h>
#include "winbase.h" #include "winbase.h"
#include "wine/windef16.h" /* HFILE16 */ #include "wine/windef16.h" /* HFILE16 */
#include "wine/unicode.h"
#define MAX_PATHNAME_LEN 1024 #define MAX_PATHNAME_LEN 1024
@ -68,12 +67,6 @@ inline static int FILE_contains_path (LPCSTR name)
strchr (name, '/') || strchr (name, '\\')); strchr (name, '/') || strchr (name, '\\'));
} }
inline static int FILE_contains_pathW (LPCWSTR name)
{
return ((*name && (name[1] == ':')) ||
strchrW (name, '/') || strchrW (name, '\\'));
}
/* files/file.c */ /* files/file.c */
extern mode_t FILE_umask; extern mode_t FILE_umask;
extern int FILE_strcasecmp( const char *str1, const char *str2 ); extern int FILE_strcasecmp( const char *str1, const char *str2 );

View File

@ -25,7 +25,6 @@
#include "winbase.h" #include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h"
/* strdup macros */ /* strdup macros */
/* DO NOT USE THEM!! they will go away soon */ /* DO NOT USE THEM!! they will go away soon */

View File

@ -30,7 +30,9 @@
#include "winternl.h" #include "winternl.h"
#include "file.h" #include "file.h"
#include "module.h" #include "module.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(module); WINE_DEFAULT_DEBUG_CHANNEL(module);

View File

@ -36,7 +36,9 @@
#include "heap.h" #include "heap.h"
#include "file.h" #include "file.h"
#include "module.h" #include "module.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/server.h" #include "wine/server.h"
WINE_DEFAULT_DEBUG_CHANNEL(module); WINE_DEFAULT_DEBUG_CHANNEL(module);

View File

@ -36,6 +36,7 @@
#include "msdos.h" #include "msdos.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(profile); WINE_DEFAULT_DEBUG_CHANNEL(profile);

View File

@ -49,7 +49,9 @@
#include "user.h" #include "user.h"
#include "win.h" #include "win.h"
#include "clipboard.h" #include "clipboard.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(clipboard); WINE_DEFAULT_DEBUG_CHANNEL(clipboard);