Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 612234 Fix for non libxul build on Windows r=neil a=blocking-2.0

Browse Source
This commit is contained in:
Ginn Chen 2010-12-06 00:06:54 +08:00
parent 6567553279
commit 07cc2342e3
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/cairo/libpixman/src/pixman-compiler.h
View File

@ -65,7 +65,7 @@
#endif
/* In libxul builds we don't ever want to export pixman symbols */
#ifdef cairo_public
#ifdef MOZ_ENABLE_LIBXUL
# define PIXMAN_EXPORT cairo_public
#else
@ -79,7 +79,7 @@
# define PIXMAN_EXPORT
#endif
#endif /* cairo_public */
#endif /* MOZ_ENABLE_LIBXUL */
/* TLS */
#if defined(PIXMAN_NO_TLS)

37
gfx/cairo/pixman-export.patch Normal file
View File

@ -0,0 +1,37 @@
diff --git a/gfx/cairo/libpixman/src/pixman-compiler.h b/gfx/cairo/libpixman/src/pixman-compiler.h
--- a/gfx/cairo/libpixman/src/pixman-compiler.h
+++ b/gfx/cairo/libpixman/src/pixman-compiler.h
@@ -59,26 +59,33 @@
# ifndef force_inline
# define force_inline inline
# endif
# ifndef noinline
# define noinline
# endif
#endif
+/* In libxul builds we don't ever want to export pixman symbols */
+#ifdef MOZ_ENABLE_LIBXUL
+# define PIXMAN_EXPORT cairo_public
+#else
+
/* GCC visibility */
#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
# define PIXMAN_EXPORT __attribute__ ((visibility("default")))
/* Sun Studio 8 visibility */
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define PIXMAN_EXPORT __global
#else
# define PIXMAN_EXPORT
#endif
+#endif /* MOZ_ENABLE_LIBXUL */
+
/* TLS */
#if defined(PIXMAN_NO_TLS)
# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
static type name
# define PIXMAN_GET_THREAD_LOCAL(name) \
(&name)