Removed extra includes from ole.h and wingdi.h.

This commit is contained in:
Alexandre Julliard 2000-02-10 19:39:48 +00:00
parent d3e22d9d55
commit fc296da4e2
20 changed files with 48 additions and 30 deletions

View File

@ -35,6 +35,8 @@
#include <time.h>
#include <assert.h>
#include "windef.h"
#include "wtypes.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "winerror.h"
#include "wownt32.h"

View File

@ -31,14 +31,15 @@
* was stored but that's about it.
*/
#include <assert.h>
#include "wingdi.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/obj_oleview.h"
#include "wine/obj_cache.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
DEFAULT_DEBUG_CHANNEL(ole);
/****************************************************************************
* PresentationDataHeader

View File

@ -10,10 +10,14 @@
#include <assert.h>
#include <time.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include "windef.h"
#include "winerror.h"
#include "wine/winestring.h"
#include "wine/winbase16.h"
#include "wingdi.h"
#include "wtypes.h"
#include "file.h"
#include "ole.h"
#include "wine/obj_base.h"
@ -23,8 +27,8 @@
#include "ldt.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
DECLARE_DEBUG_CHANNEL(relay)
DEFAULT_DEBUG_CHANNEL(ole);
DECLARE_DEBUG_CHANNEL(relay);
struct storage_header {
BYTE magic[8]; /* 00: magic */

View File

@ -22,6 +22,16 @@
#include "config.h"
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <time.h>
#ifdef HAVE_FLOAT_H
# include <float.h>
#endif
#include "windef.h"
#include "oleauto.h"
#include "heap.h"
@ -29,16 +39,7 @@
#include "winerror.h"
#include "parsedt.h"
DEFAULT_DEBUG_CHANNEL(ole)
#include <string.h>
#include <stdlib.h>
#include <math.h>
#include <time.h>
#ifdef HAVE_FLOAT_H
# include <float.h>
#endif
DEFAULT_DEBUG_CHANNEL(ole);
#ifndef FLT_MAX
# ifdef MAXFLOAT

View File

@ -6,11 +6,14 @@
/* At the moment, these are only empty stubs.
*/
#include "windef.h"
#include "wingdi.h"
#include "wtypes.h"
#include "ole.h"
#include "gdi.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
DEFAULT_DEBUG_CHANNEL(ole);
extern LONG OLE_current_handle;

View File

@ -7,10 +7,13 @@
/* At the moment, these are only empty stubs.
*/
#include "windef.h"
#include "wingdi.h"
#include "wtypes.h"
#include "ole.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
DEFAULT_DEBUG_CHANNEL(ole);
LONG OLE_current_handle;

View File

@ -6,6 +6,7 @@
*
*/
#include "windef.h"
#include "wingdi.h"
#include "cache.h"

View File

@ -5,6 +5,7 @@
*/
#include <string.h>
#include "windef.h"
#include "wingdi.h"
#include "gdi.h"
#include "heap.h"
@ -12,7 +13,7 @@
#include "dc.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(driver)
DEFAULT_DEBUG_CHANNEL(driver);
/***********************************************************************
* Escape16 [GDI.38]

View File

@ -6,13 +6,14 @@
#include "config.h"
#include "wine/wingdi16.h"
#include "windef.h"
#include "wingdi.h"
#include "dc.h"
#include "debugtools.h"
#include "gdi.h"
#include "ttydrv.h"
DEFAULT_DEBUG_CHANNEL(ttydrv)
DEFAULT_DEBUG_CHANNEL(ttydrv);
/***********************************************************************
* TTYDRV_DC_ExtTextOut

View File

@ -1,6 +1,7 @@
#ifndef __WINE_COLOR_H
#define __WINE_COLOR_H
#include "windef.h"
#include "wingdi.h"
#include "palette.h"

View File

@ -5,6 +5,7 @@
#ifndef __WINE_ENHMETAFILEDRV_H
#define __WINE_ENHMETAFILEDRV_H
#include "windef.h"
#include "wingdi.h"
#include "gdi.h"

View File

@ -5,6 +5,7 @@
#ifndef __WINE_METAFILEDRV_H
#define __WINE_METAFILEDRV_H
#include "windef.h"
#include "wingdi.h"
#include "gdi.h"

View File

@ -5,15 +5,6 @@
#ifndef __WINE_OLE_H
#define __WINE_OLE_H
#include "wingdi.h" /* LOGPALETTE */
/* FIXME: we need to include wtypes.h mainly, it seems, because we need BSTR.
* Normally none of the APIs in ole.h depend on it. It is most likey that they should
* be moved to ole2.h (which includes objbase.h and thus wtypes.h) or some other
* OLE include
*/
#include "wtypes.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -6,6 +6,7 @@
*
* Copyright 1998 Huw D M Davies
*/
#include "windef.h"
#include "wingdi.h"
#include "font.h"
#include "pen.h"

View File

@ -5,6 +5,7 @@
#ifndef __WINE_WIN16DRV_H
#define __WINE_WIN16DRV_H
#include "windef.h"
#include "wingdi.h"
#include "gdi.h"

View File

@ -1,8 +1,6 @@
#ifndef __WINE_WINGDI_H
#define __WINE_WINGDI_H
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -1,7 +1,9 @@
/* Sample winestub.c file for compiling programs with libwine.so. */
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "xmalloc.h"

View File

@ -7,6 +7,8 @@
* Copyright 2000 Andreas Mohr
*/
#include "config.h"
#include <errno.h>
#include <string.h>
#include <fcntl.h>

View File

@ -7,6 +7,8 @@
* (c) 1999 Eric Pouech
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

View File

@ -5,6 +5,7 @@
*/
#include <stdlib.h>
#include "windef.h"
#include "wingdi.h"
#include "wine/wingdi16.h"