[cairo] Fix OS/2 build

[Behdad Esfahbod]

Dave Yeo wrote:
> Hi, this commit,
> http://gitweb.freedesktop.org/?p=cairo;a=commitdiff;h=d84752605a4aee96fa
> 872a97a50e59a44ee7051a
> broke OS/2. We now get this error,
> In file included from ./cairo-os2-private.h:41:
> ./cairo-os2.h:56: error: syntax error before "hps_client_window"
> ./cairo-os2.h:58: warning: function declaration isn't a prototype
> ./cairo-os2.h:62: error: syntax error before "HWND"
> ./cairo-os2.h:62: warning: function declaration isn't a prototype
> ./cairo-os2.h:72: error: syntax error before "HPS"
> 
> The problem is that these are all defined in os2*.h. Simplest fix seems
> to be

Then the correct fix is to include os2*.h in cairo-os2.h.  I can commit if you
send a patch.

behdad


> --- cairo-os2-private.h.orig    Sat Nov  8 23:29:16 2008
> +++ cairo-os2-private.h Sat Nov  8 23:29:56 2008
> @@ -38,7 +38,6 @@
>  #ifndef CAIRO_OS2_PRIVATE_H
>  #define CAIRO_OS2_PRIVATE_H
> 
> -#include "cairo-os2.h"
>  #include "cairoint.h"
> 
>  #define INCL_DOS
> @@ -51,6 +50,8 @@
>  #else
>  # include <os2emx.h>
>  #endif
> +
> +#include "cairo-os2.h"
> 
>  typedef struct _cairo_os2_surface
>  {
> 
> If this seems correct could someone commit this please
> Dave
> 
> _______________________________________________
> cairo mailing list
> cairo at cairographics.org
> http://lists.cairographics.org/mailman/listinfo/cairo
>