[cairo-commit] src/cairo.h src/cairo-system.c

[Behdad Esfahbod]

 src/cairo-system.c |    2 +-
 src/cairo.h        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f3a48f90b409653a2d4fb802779ecb7508e4d6e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 26 13:27:42 2008 -0400

    [cairo.h] Don't define cairo_public to __declspec(dllimport) for static build
    
    That define should target win32 DLL builds only.  We can't tell though,
    so we require user to define CAIRO_WIN32_STATIC_BUILD to signal that.

diff --git a/src/cairo-system.c b/src/cairo-system.c
index 9970fce..85c7487 100644
--- a/src/cairo-system.c
+++ b/src/cairo-system.c
@@ -50,7 +50,7 @@
 
 
 #if CAIRO_MUTEX_IMPL_WIN32
-#if !defined(CAIRO_WIN32_STATIC_BUILD)
+#if !CAIRO_WIN32_STATIC_BUILD
 
 #define WIN32_LEAN_AND_MEAN
 /* We require Windows 2000 features such as ETO_PDY */
diff --git a/src/cairo.h b/src/cairo.h
index 8b5044a..9b700b7 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef cairo_public
-# ifdef _MSC_VER
+# if _MSC_VER && !CAIRO_WIN32_STATIC_BUILD
 #  define cairo_public __declspec(dllimport)
 # else
 #  define cairo_public