diff options
| author | Jonathon Jongsma <jjongsma@gnome.org> | 2006-03-15 01:00:59 +0000 |
|---|---|---|
| committer | Jonathon Jongsma <jjongsma@gnome.org> | 2006-03-15 01:00:59 +0000 |
| commit | b752651e1f5d319db40c5525798523e100a40fac (patch) | |
| tree | 213661685af8b787b135efe2119916dfb6165a54 | |
| parent | 614c09d7f3384b16c916ff68a8350644ba79a197 (diff) | |
2006-03-14 Jonathon Jongsma <jonathon.jongsma@gmail.com>
* cairomm/fontface.h:
* cairomm/fontoptions.h:
* cairomm/path.h:
* cairomm/pattern.h: include <cairo.h> instead of <cairo/cairo.h> since it
didn't want to compile on windows without these
* cairomm/win32_surface.cc:
* cairomm/win32_surface.h: Move the include of cairo-win32.h from the
source file to the header since the declaration of create() needs the HDC
type definition.
With these changes, cairomm should compile the Win32Surface cleanly with
mingw on Microsoft Windows
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | cairomm/fontface.h | 2 | ||||
| -rw-r--r-- | cairomm/fontoptions.h | 2 | ||||
| -rw-r--r-- | cairomm/path.h | 2 | ||||
| -rw-r--r-- | cairomm/pattern.h | 2 | ||||
| -rw-r--r-- | cairomm/win32_surface.cc | 4 | ||||
| -rw-r--r-- | cairomm/win32_surface.h | 4 |
7 files changed, 22 insertions, 8 deletions
@@ -1,3 +1,17 @@ +2006-03-14 Jonathon Jongsma <jonathon.jongsma@gmail.com> + + * cairomm/fontface.h: + * cairomm/fontoptions.h: + * cairomm/path.h: + * cairomm/pattern.h: include <cairo.h> instead of <cairo/cairo.h> since it + didn't want to compile on windows without these + * cairomm/win32_surface.cc: + * cairomm/win32_surface.h: Move the include of cairo-win32.h from the + source file to the header since the declaration of create() needs the HDC + type definition. + With these changes, cairomm should compile the Win32Surface cleanly with + mingw on Microsoft Windows + 2006-03-12 Danilo Piazzalunga <danilopiazza@gmail.com> * autogen.sh: Allow overriding aclocal, automake, autoconf and libtoolize diff --git a/cairomm/fontface.h b/cairomm/fontface.h index 40f9d1f..c59f86f 100644 --- a/cairomm/fontface.h +++ b/cairomm/fontface.h @@ -20,7 +20,7 @@ #define __CAIROMM_FONTFACE_H #include <cairomm/enums.h> -#include <cairo/cairo.h> +#include <cairo.h> namespace Cairo diff --git a/cairomm/fontoptions.h b/cairomm/fontoptions.h index 2ecdc78..3c35176 100644 --- a/cairomm/fontoptions.h +++ b/cairomm/fontoptions.h @@ -21,7 +21,7 @@ #include <cairomm/enums.h> #include <string> -#include <cairo/cairo.h> +#include <cairo.h> namespace Cairo diff --git a/cairomm/path.h b/cairomm/path.h index 8d8f80a..5b0a2ca 100644 --- a/cairomm/path.h +++ b/cairomm/path.h @@ -21,7 +21,7 @@ #include <cairomm/enums.h> #include <string> -#include <cairo/cairo.h> +#include <cairo.h> namespace Cairo diff --git a/cairomm/pattern.h b/cairomm/pattern.h index 55efcef..df679b6 100644 --- a/cairomm/pattern.h +++ b/cairomm/pattern.h @@ -21,7 +21,7 @@ #include <cairomm/surface.h> #include <cairomm/enums.h> -#include <cairo/cairo.h> +#include <cairo.h> namespace Cairo diff --git a/cairomm/win32_surface.cc b/cairomm/win32_surface.cc index f743a3a..7e5ed8e 100644 --- a/cairomm/win32_surface.cc +++ b/cairomm/win32_surface.cc @@ -19,10 +19,6 @@ #include <cairomm/win32_surface.h> #include <cairomm/private.h> -#ifdef CAIRO_HAS_WIN32_SURFACE -#include <cairo-win32.h> -#endif - namespace Cairo { diff --git a/cairomm/win32_surface.h b/cairomm/win32_surface.h index 0157618..f47f4bf 100644 --- a/cairomm/win32_surface.h +++ b/cairomm/win32_surface.h @@ -21,6 +21,10 @@ #include <cairomm/surface.h> +#ifdef CAIRO_HAS_WIN32_SURFACE +#include <cairo-win32.h> +#endif + // This header is not included by cairomm.h because it requires Windows headers that // tend to pollute the namespace with non-prefixed #defines and typedefs. // You may include it directly if you need to use this API. |