Bug 10407

Summary: symbol clash in cairo-boilerplate.c between quartz and xlib
Product: cairo Reporter: Brian Ewins <Brian.Ewins>
Component: generalAssignee: Carl Worth <cworth>
Status: RESOLVED FIXED QA Contact: cairo-bugs mailing list <cairo-bugs>
Severity: blocker    
Priority: medium    
Version: 1.4.3   
Hardware: Other   
OS: Mac OS X (All)   
Whiteboard:
i915 platform: i915 features:
Attachments: split out quartz stuff from cairo-boilerplate.c

Description Brian Ewins 2007-03-25 18:00:26 UTC 
If you build on the mac with:
./autogen.sh --enable-atsui --enable-quartz

... the build fails due to a clash between the Picture and Cursor symbols defined in quartz and those defined in xlib. Fixing this is necessary to allow a single binary to be used on the mac supporting both xlib and quartz users.

We've talked about this a few times on irc, I'm hoping we can land a fix for 1.4.4. I'll attach the patch in a moment, please review and I'll push it ASAP.
Comment 1 Brian Ewins 2007-03-25 18:26:20 UTC 
Created attachment 9295 [details] [review]
split out quartz stuff from cairo-boilerplate.c

This adds cairo-quartz-boilerplate.c, and a cairo-boilerplate-private.h containing the necessary definitions. I've left the copyright/licenses as they were, other than the year, since I'm just shifting code - maybe we could do with a 2007 update across the board? Is this ok?

This builds fine for me now, I can happily run tests for quartz and xlib simultaneously.
Comment 2 Behdad Esfahbod 2007-04-03 12:56:03 UTC 
We may add boilerplate back to SUBDIRS after this is committed.
Comment 3 Brian Ewins 2007-04-03 17:26:29 UTC 
Pushed in 3646839060de7ab51c805bf5614fc3d1ea8b7fc3

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.