Hey Jon, One additional change needed (see below). Please squash that in and then you can tag it:
Reviewed-by: Jeremy Huddleston Sequoia <jerem...@apple.com> Tested-by: Jeremy Huddleston Sequoia <jerem...@apple.com> Thanks, Jeremy --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -54,6 +54,8 @@ #include "damage.h" #endif +#include "nonsdk_extinit.h" + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 // From NSApplication.h extern const double NSAppKitVersionNumber; > On Mar 29, 2015, at 15:22, Jon TURNEY <jon.tur...@dronecode.org.uk> wrote: > > On 29/03/2015 21:31, Colin Harrison wrote: >> Builds for me on MinGW-w64. I suspect the '#ifdef INXQUARTZ' ...'#endif', 5 >> lines, removal in exinit.h needs reverting for Jeremy? >> Sorry, I can't test for the Darwin build. > > That would work, but I think better would be to #include "nonsdk_extinit.h" > in miiniext.c, to avoid duplicating the prototype of > PseudoramiXExtensionInit() > >>> Sorry, I didn't get around to reviewing or testing these earlier. I >> suspect this >>> might be the cause of the build failure fallout on tinderbox: >>> >>> http://tinderbox.x.org/builds/2015-03-29-0002/logs/xserver/#build > > Jeremy, > > Sorry for the breakage. I should know by now better than to touch this stuff. > > Can you try the attached please? > > <0001-Fix-XQuartz-build.patch>_______________________________________________ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
