[os2] Fix includes

Patch from Dave Yeo to make cairo-os2.h include os2.h directly so the
header is standalone.
This commit is contained in:
Behdad Esfahbod 2008-11-13 10:50:41 +01:00
parent 0a682034a0
commit 279a7cef34
3 changed files with 8 additions and 16 deletions

View file

@ -41,17 +41,6 @@
#include "cairo-os2.h"
#include "cairoint.h"
#define INCL_DOS
#define INCL_DOSSEMAPHORES
#define INCL_DOSERRORS
#define INCL_WIN
#define INCL_GPI
#ifdef __WATCOMC__
# include <os2.h>
#else
# include <os2emx.h>
#endif
typedef struct _cairo_os2_surface
{
cairo_surface_t base;

View file

@ -43,11 +43,6 @@
#include <float.h>
#ifdef BUILD_CAIRO_DLL
# define INCL_WIN
# define INCL_GPI
# define INCL_DOS
# define INCL_DOSERRORS
# include <os2emx.h>
# include "cairo-os2.h"
# ifndef __WATCOMC__
# include <emx/startup.h>

View file

@ -38,6 +38,14 @@
#ifndef _CAIRO_OS2_H_
#define _CAIRO_OS2_H_
#define INCL_DOS
#define INCL_DOSSEMAPHORES
#define INCL_DOSERRORS
#define INCL_WIN
#define INCL_GPI
#include <os2.h>
#include "cairo.h"
CAIRO_BEGIN_DECLS