[cairo.h] Don't define cairo_public to __declspec(dllimport) for stat…

…ic 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.
git-mirror · Sep 26, 2008 · 7f3a48f · 7f3a48f
1 parent b6e910f
commit 7f3a48f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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