Don't include debugtools.h in the header file, moved it to the C files
that need it (and used the new wine/debug.h while we are at it).
This commit is contained in:
parent
dbe2cd907d
commit
bd1689ec0a
|
@ -13,7 +13,9 @@
|
||||||
#include "msvcrt/malloc.h"
|
#include "msvcrt/malloc.h"
|
||||||
#include "msvcrt/stdio.h"
|
#include "msvcrt/stdio.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,9 @@
|
||||||
#include "msvcrt/eh.h"
|
#include "msvcrt/eh.h"
|
||||||
#include "msvcrt/malloc.h"
|
#include "msvcrt/malloc.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
|
|
||||||
typedef void (*v_table_ptr)();
|
typedef void (*v_table_ptr)();
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
|
|
||||||
#include "msvcrt/ctype.h"
|
#include "msvcrt/ctype.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* Some abbreviations to make the following table readable */
|
/* Some abbreviations to make the following table readable */
|
||||||
#define _C_ _CONTROL
|
#define _C_ _CONTROL
|
||||||
|
|
|
@ -10,7 +10,9 @@
|
||||||
#include "msvcrt/string.h"
|
#include "msvcrt/string.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
unsigned int MSVCRT___argc;
|
unsigned int MSVCRT___argc;
|
||||||
unsigned int MSVCRT_basemajor;/* FIXME: */
|
unsigned int MSVCRT_basemajor;/* FIXME: */
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
#include "msvcrt/string.h"
|
#include "msvcrt/string.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* INTERNAL: Translate finddata_t to PWIN32_FIND_DATAA */
|
/* INTERNAL: Translate finddata_t to PWIN32_FIND_DATAA */
|
||||||
static void msvcrt_fttofd(LPWIN32_FIND_DATAA fd, struct _finddata_t* ft)
|
static void msvcrt_fttofd(LPWIN32_FIND_DATAA fd, struct _finddata_t* ft)
|
||||||
|
|
|
@ -12,7 +12,9 @@
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* getenv (MSVCRT.@)
|
* getenv (MSVCRT.@)
|
||||||
|
|
|
@ -15,7 +15,9 @@
|
||||||
#include "msvcrt/string.h"
|
#include "msvcrt/string.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
|
|
||||||
/* INTERNAL: Set the crt and dos errno's from the OS error given. */
|
/* INTERNAL: Set the crt and dos errno's from the OS error given. */
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
#include "msvcrt/setjmp.h"
|
#include "msvcrt/setjmp.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
typedef void (*MSVCRT_sig_handler_func)(void);
|
typedef void (*MSVCRT_sig_handler_func)(void);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* MT */
|
/* MT */
|
||||||
extern CRITICAL_SECTION MSVCRT_exit_cs;
|
extern CRITICAL_SECTION MSVCRT_exit_cs;
|
||||||
|
|
|
@ -25,7 +25,9 @@
|
||||||
#include "msvcrt/sys/utime.h"
|
#include "msvcrt/sys/utime.h"
|
||||||
#include "msvcrt/time.h"
|
#include "msvcrt/time.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* for stat mode, permissions apply to all,owner and group */
|
/* for stat mode, permissions apply to all,owner and group */
|
||||||
#define MSVCRT_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6))
|
#define MSVCRT_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6))
|
||||||
|
|
|
@ -13,7 +13,9 @@
|
||||||
#include "msvcrt/malloc.h"
|
#include "msvcrt/malloc.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* MT */
|
/* MT */
|
||||||
extern CRITICAL_SECTION MSVCRT_heap_cs;
|
extern CRITICAL_SECTION MSVCRT_heap_cs;
|
||||||
|
|
|
@ -10,7 +10,9 @@
|
||||||
#include "msvcrt.h"
|
#include "msvcrt.h"
|
||||||
#include "msvcrt/locale.h"
|
#include "msvcrt/locale.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* FIXME: Need to hold locale for each LC_* type and aggregate
|
/* FIXME: Need to hold locale for each LC_* type and aggregate
|
||||||
* string to produce lc_all.
|
* string to produce lc_all.
|
||||||
|
|
|
@ -9,7 +9,9 @@
|
||||||
#include "msvcrt/stdio.h"
|
#include "msvcrt/stdio.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* Index to TLS */
|
/* Index to TLS */
|
||||||
DWORD MSVCRT_tls_index;
|
DWORD MSVCRT_tls_index;
|
||||||
|
|
|
@ -16,7 +16,9 @@
|
||||||
|
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
#ifndef HAVE_FINITE
|
#ifndef HAVE_FINITE
|
||||||
#ifndef finite /* Could be a macro */
|
#ifndef finite /* Could be a macro */
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
#include "msvcrt/wctype.h"
|
#include "msvcrt/wctype.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
unsigned char MSVCRT_mbctype[257];
|
unsigned char MSVCRT_mbctype[257];
|
||||||
int MSVCRT___mb_cur_max = 1;
|
int MSVCRT___mb_cur_max = 1;
|
||||||
|
|
|
@ -10,7 +10,9 @@
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "debugtools.h"
|
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "winerror.h"
|
#include "winerror.h"
|
||||||
#include "winnls.h"
|
#include "winnls.h"
|
||||||
|
|
|
@ -18,7 +18,9 @@
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
#include "msvcrt/string.h"
|
#include "msvcrt/string.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* FIXME: Check file extensions for app to run */
|
/* FIXME: Check file extensions for app to run */
|
||||||
static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e';
|
static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e';
|
||||||
|
|
|
@ -11,7 +11,9 @@
|
||||||
#include "msvcrt/stdlib.h"
|
#include "msvcrt/stdlib.h"
|
||||||
#include "msvcrt/string.h"
|
#include "msvcrt/string.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/* INTERNAL: MSVCRT_malloc() based strndup */
|
/* INTERNAL: MSVCRT_malloc() based strndup */
|
||||||
char* msvcrt_strndup(const char* buf, unsigned int size)
|
char* msvcrt_strndup(const char* buf, unsigned int size)
|
||||||
|
|
|
@ -8,7 +8,9 @@
|
||||||
#include "msvcrt/malloc.h"
|
#include "msvcrt/malloc.h"
|
||||||
#include "msvcrt/process.h"
|
#include "msvcrt/process.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
/********************************************************************/
|
/********************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,9 @@
|
||||||
#include "msvcrt/time.h"
|
#include "msvcrt/time.h"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
|
|
||||||
/* INTERNAL: Return formatted current time/date */
|
/* INTERNAL: Return formatted current time/date */
|
||||||
|
|
|
@ -15,7 +15,9 @@
|
||||||
#include "msvcrt/string.h"
|
#include "msvcrt/string.h"
|
||||||
#include "msvcrt/wctype.h"
|
#include "msvcrt/wctype.h"
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(msvcrt);
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
|
||||||
|
|
||||||
|
|
||||||
/* INTERNAL: MSVCRT_malloc() based wstrndup */
|
/* INTERNAL: MSVCRT_malloc() based wstrndup */
|
||||||
|
|
Loading…
Reference in New Issue