Alexandre Julliard : msvcrt: Avoid including system headers in msvcrt.h.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 429cd9e8173451c92faaf36661145e7ff3f5506d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=429cd9e8173451c92faaf366...

Author: Alexandre Julliard 
Date:   Mon Jul 10 11:54:10 2006 +0200

msvcrt: Avoid including system headers in msvcrt.h.

---

dlls/msvcrt/ctype.c  |    2 ++
 dlls/msvcrt/locale.c |    1 +
 dlls/msvcrt/msvcrt.h |    4 ----
 dlls/msvcrt/time.c   |    1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 71e4ec6..9c23810 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -17,7 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include "msvcrt.h"
+#include "winnls.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index 367b1b2..de4cb58 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -28,6 +28,7 @@ #include <stdio.h>
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
+#include "winnls.h"

#include "msvcrt.h"
 #include "mtdll.h"
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index fc330ce..0066e3d 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -37,13 +37,9 @@ #ifndef __WINE_MSVCRT_H
 #define __WINE_MSVCRT_H

#include <stdarg.h>
-#include <ctype.h>
-#include <string.h>

#include "windef.h"
 #include "winbase.h"
-#include "winerror.h"
-#include "winnls.h"

typedef unsigned short MSVCRT_wchar_t;
 typedef unsigned short MSVCRT_wint_t;
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 868a0dc..5da2f9c 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -33,6 +33,7 @@ #include <limits.h>

#include "msvcrt.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);