ooo-build r11455 - in trunk: . patches/cairo

[strba svn gnome org]

Author: strba
Date: Wed Jan 30 10:41:54 2008
New Revision: 11455
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11455&view=rev

Log:
include <cairo.h> first and use its defines after

Modified:
   trunk/ChangeLog
   trunk/patches/cairo/cairo-canvas-win32.diff

Modified: trunk/patches/cairo/cairo-canvas-win32.diff
==============================================================================
--- trunk/patches/cairo/cairo-canvas-win32.diff	(original)
+++ trunk/patches/cairo/cairo-canvas-win32.diff	Wed Jan 30 10:41:54 2008
@@ -59,7 +59,7 @@
 dummy line to avoid confusing diff-mode
 --- canvas/source/cairo/cairo_cairo.hxx
 +++ canvas/source/cairo/cairo_cairo.hxx
-@@ -1,9 +1,13 @@
+@@ -1,12 +1,16 @@
  #ifndef _CAIROCANVAS_CAIRO_HXX
  #define _CAIROCANVAS_CAIRO_HXX
  
@@ -67,12 +67,17 @@
 +
  namespace cairo {
  
++#include <cairo.h>
++ 
 +#ifdef CAIRO_HAS_XLIB_SURFACE
          bool HasXRender( const void* pSysData );
 +#endif
  
- #include <cairo.h>
- 
+-#include <cairo.h>
+- 
+ 	typedef cairo_t Cairo;
+ 	typedef cairo_matrix_t Matrix;
+ 	typedef cairo_format_t Format;
 @@ -15,15 +15,25 @@
  
  	class Surface {