From bd1689ec0a49d2afd07a08ded0201baa44028065 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 22 Jan 2002 00:57:16 +0000
Subject: [PATCH] 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).

---
 dlls/msvcrt/console.c | 4 +++-
 dlls/msvcrt/cpp.c     | 4 +++-
 dlls/msvcrt/ctype.c   | 4 +++-
 dlls/msvcrt/data.c    | 4 +++-
 dlls/msvcrt/dir.c     | 4 +++-
 dlls/msvcrt/environ.c | 4 +++-
 dlls/msvcrt/errno.c   | 4 +++-
 dlls/msvcrt/except.c  | 4 +++-
 dlls/msvcrt/exit.c    | 4 +++-
 dlls/msvcrt/file.c    | 4 +++-
 dlls/msvcrt/heap.c    | 4 +++-
 dlls/msvcrt/locale.c  | 4 +++-
 dlls/msvcrt/main.c    | 4 +++-
 dlls/msvcrt/math.c    | 4 +++-
 dlls/msvcrt/mbcs.c    | 4 +++-
 dlls/msvcrt/misc.c    | 4 +++-
 dlls/msvcrt/msvcrt.h  | 1 -
 dlls/msvcrt/process.c | 4 +++-
 dlls/msvcrt/string.c  | 4 +++-
 dlls/msvcrt/thread.c  | 4 +++-
 dlls/msvcrt/time.c    | 4 +++-
 dlls/msvcrt/wcs.c     | 4 +++-
 22 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c
index c65b66b4981..980c69167d3 100644
--- a/dlls/msvcrt/console.c
+++ b/dlls/msvcrt/console.c
@@ -13,7 +13,9 @@
 #include "msvcrt/malloc.h"
 #include "msvcrt/stdio.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 68599988884..185215ed312 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -8,7 +8,9 @@
 #include "msvcrt/eh.h"
 #include "msvcrt/malloc.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 typedef void (*v_table_ptr)();
diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 7d001ee244b..d201acf3166 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -7,7 +7,9 @@
 
 #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 */
 #define _C_ _CONTROL
diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index 06b5c6eec1f..62061936863 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -10,7 +10,9 @@
 #include "msvcrt/string.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 unsigned int MSVCRT___argc;
 unsigned int MSVCRT_basemajor;/* FIXME: */
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 8dc0ad31694..7d1fc091425 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -20,7 +20,9 @@
 #include "msvcrt/stdlib.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 */
 static void msvcrt_fttofd(LPWIN32_FIND_DATAA fd, struct _finddata_t* ft)
diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c
index ee47198f505..33053837d06 100644
--- a/dlls/msvcrt/environ.c
+++ b/dlls/msvcrt/environ.c
@@ -12,7 +12,9 @@
 #include "msvcrt/stdlib.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /*********************************************************************
  *		getenv (MSVCRT.@)
diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index 48e54608776..20061ceea54 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -15,7 +15,9 @@
 #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. */
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index 2343cd28ba1..a1904868da3 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -18,7 +18,9 @@
 #include "msvcrt/setjmp.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 typedef void (*MSVCRT_sig_handler_func)(void);
 
diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index 88eae11364e..274035a6fc8 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -9,7 +9,9 @@
 #include "msvcrt/stdlib.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* MT */
 extern CRITICAL_SECTION MSVCRT_exit_cs;
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 7e3e75ad9e9..82e828e8f78 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -25,7 +25,9 @@
 #include "msvcrt/sys/utime.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 */
 #define MSVCRT_S_IREAD  (_S_IREAD  | (_S_IREAD  >> 3) | (_S_IREAD  >> 6))
diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index fa1a17cf0a8..1ae40ac2a6c 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -13,7 +13,9 @@
 #include "msvcrt/malloc.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* MT */
 extern CRITICAL_SECTION MSVCRT_heap_cs;
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index 8d025008424..512ee3b0655 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -10,7 +10,9 @@
 #include "msvcrt.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
  * string to produce lc_all.
diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c
index 2f4fb3339a6..684dcccbcc6 100644
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -9,7 +9,9 @@
 #include "msvcrt/stdio.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* Index to TLS */
 DWORD MSVCRT_tls_index;
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index e3f446460dd..fa7196c1733 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -16,7 +16,9 @@
 
 #include "msvcrt/stdlib.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 #ifndef HAVE_FINITE
 #ifndef finite /* Could be a macro */
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index d81fa3cb9ad..1d2abd4dedf 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -18,7 +18,9 @@
 #include "msvcrt/wctype.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 unsigned char MSVCRT_mbctype[257];
 int MSVCRT___mb_cur_max = 1;
diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c
index ebbc12e1316..71a4762cfde 100644
--- a/dlls/msvcrt/misc.c
+++ b/dlls/msvcrt/misc.c
@@ -10,7 +10,9 @@
 #include "msvcrt/stdlib.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /*********************************************************************
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 3115597f773..f548baefece 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -6,7 +6,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "debugtools.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c
index 0a860037d80..3d0e4d21bbe 100644
--- a/dlls/msvcrt/process.c
+++ b/dlls/msvcrt/process.c
@@ -18,7 +18,9 @@
 #include "msvcrt/stdlib.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 */
 static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e';
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 8b3b1bf49ca..11d6737be1e 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -11,7 +11,9 @@
 #include "msvcrt/stdlib.h"
 #include "msvcrt/string.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* INTERNAL: MSVCRT_malloc() based strndup */
 char* msvcrt_strndup(const char* buf, unsigned int size)
diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c
index 08139084e48..a2351c09471 100644
--- a/dlls/msvcrt/thread.c
+++ b/dlls/msvcrt/thread.c
@@ -8,7 +8,9 @@
 #include "msvcrt/malloc.h"
 #include "msvcrt/process.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /********************************************************************/
 
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index a78ce992f45..580d9119334 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -15,7 +15,9 @@
 #include "msvcrt/time.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /* INTERNAL: Return formatted current time/date */
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index f8a7f1a04ed..523571e7b74 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -15,7 +15,9 @@
 #include "msvcrt/string.h"
 #include "msvcrt/wctype.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /* INTERNAL: MSVCRT_malloc() based wstrndup */
-- 
GitLab