Commit 1ed55775 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Don't include windows.h internally.

parent c3350c53
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include "winuser.h" #include "winuser.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "winnls.h"
#include "ole2.h" #include "ole2.h"
#include "debugtools.h" #include "debugtools.h"
#include "olestd.h" #include "olestd.h"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <assert.h> #include <assert.h>
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "debugtools.h" #include "debugtools.h"
#include "objbase.h" #include "objbase.h"
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include "winerror.h" #include "winerror.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h"
#include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "wine/obj_connection.h" #include "wine/obj_connection.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "oleauto.h" #include "oleauto.h"
#include "heap.h" #include "heap.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "initguid.h" #include "initguid.h"
#include "oleauto.h" #include "oleauto.h"
#include "ole2.h"
#include "olectl.h" #include "olectl.h"
DEFAULT_DEBUG_CHANNEL(ole); DEFAULT_DEBUG_CHANNEL(ole);
......
...@@ -11,10 +11,12 @@ ...@@ -11,10 +11,12 @@
#include "winerror.h" #include "winerror.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "oleauto.h" /* for SysAllocString(....) */ #include "oleauto.h" /* for SysAllocString(....) */
#include "wine/obj_olefont.h" #include "wine/obj_olefont.h"
#include "wine/obj_storage.h" #include "wine/obj_storage.h"
#include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h" #include "heap.h"
......
...@@ -23,6 +23,10 @@ ...@@ -23,6 +23,10 @@
*/ */
#include "winerror.h" #include "winerror.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "wine/obj_picture.h" #include "wine/obj_picture.h"
#include "debugtools.h" #include "debugtools.h"
......
...@@ -7,7 +7,10 @@ ...@@ -7,7 +7,10 @@
*/ */
#include "windef.h" #include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "debugtools.h" #include "debugtools.h"
#include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "heap.h" #include "heap.h"
......
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
#include <stddef.h> #include <stddef.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include "charlist.h" #include "charlist.h"
#include "windows.h" #include "windef.h"
#include "winbase.h"
extern HANDLE RICHED32_hHeap; extern HANDLE RICHED32_hHeap;
......
...@@ -72,8 +72,10 @@ ...@@ -72,8 +72,10 @@
#include "text_map.h" #include "text_map.h"
#include <stdlib.h> #include <stdlib.h>
#include "charlist.h" #include "charlist.h"
#include "windows.h" #include "windef.h"
#include "winbase.h"
#include "debugtools.h" #include "debugtools.h"
extern HANDLE RICHED32_hHeap; extern HANDLE RICHED32_hHeap;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
*/ */
#include "windows.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "heap.h" #include "heap.h"
#include "debugtools.h" #include "debugtools.h"
......
...@@ -2,8 +2,12 @@ ...@@ -2,8 +2,12 @@
#define _RTF #define _RTF
#include <stdio.h> #include <stdio.h>
#include <windows.h>
#include <richedit.h> #include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "richedit.h"
void RTFSetEditStream(EDITSTREAM *es); void RTFSetEditStream(EDITSTREAM *es);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
*/ */
#include "windows.h" #include "windef.h"
#include "objbase.h" #include "objbase.h"
#include "debugtools.h" #include "debugtools.h"
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>
#include <netdb.h> #ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -21,7 +23,9 @@ ...@@ -21,7 +23,9 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/in.h> #ifdef HAVE_NETINET_IH_H
# include <netinet/in.h>
#endif
#include <netinet/ip.h> #include <netinet/ip.h>
#include "winbase.h" #include "winbase.h"
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
#include "config.h" #include "config.h"
#include "windows.h" #include "windef.h"
#include "winbase.h"
#include "wininet.h" #include "wininet.h"
#include "debugtools.h" #include "debugtools.h"
#include "winerror.h" #include "winerror.h"
...@@ -19,7 +20,9 @@ ...@@ -19,7 +20,9 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#include <netdb.h> #ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#include <ctype.h> #include <ctype.h>
#include <unistd.h> #include <unistd.h>
#include "windows.h" #include "windef.h"
#include "winbase.h"
#include "wininet.h" #include "wininet.h"
#include "debugtools.h" #include "debugtools.h"
#include "winerror.h" #include "winerror.h"
......
...@@ -7,12 +7,14 @@ ...@@ -7,12 +7,14 @@
* *
*/ */
#include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include "config.h" #include "windef.h"
#include "windows.h" #include "winbase.h"
#include "wininet.h" #include "wininet.h"
#include "winerror.h" #include "winerror.h"
#include "winsock.h" #include "winsock.h"
......
#ifndef __WINE_OCIDL_H #ifndef __WINE_OCIDL_H
#define __WINE_OCIDL_H #define __WINE_OCIDL_H
#if !defined(COM_NO_WINDOWS_H) && !defined(__WINE__)
#include "windows.h" #include "windows.h"
#include "ole2.h" #include "ole2.h"
#endif
#include "wine/obj_base.h" #include "wine/obj_base.h"
......
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
#ifndef __WINE_RPC_H #ifndef __WINE_RPC_H
#define __WINE_RPC_H #define __WINE_RPC_H
#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINE__)
#include "windows.h"
#endif
#define __RPC_FAR #define __RPC_FAR
#define __RPC_API WINAPI #define __RPC_API WINAPI
#define __RPC_USER WINAPI #define __RPC_USER WINAPI
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
#include "rpc.h" #include "rpc.h"
#include "rpcndr.h" #include "rpcndr.h"
#include "wine/obj_base.h" #if !defined(COM_NO_WINDOWS_H) && !defined(__WINE__)
#ifndef COM_NO_WINDOWS_H
#include "windows.h" #include "windows.h"
#include "ole2.h" #include "ole2.h"
#endif #endif
#include "wine/obj_base.h"
#endif /* __WINE_UNKNWN_H */ #endif /* __WINE_UNKNWN_H */
#ifndef __WINE_WINDOWS_H #ifndef __WINE_WINDOWS_H
#define __WINE_WINDOWS_H #define __WINE_WINDOWS_H
#ifdef __WINE__
#error Wine should not include windows.h internally
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "config.h" #include "config.h"
#include "windows.h" #include "windef.h"
#include "miscemu.h" #include "miscemu.h"
#include "msdos.h" #include "msdos.h"
#include "drive.h" #include "drive.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment