xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Fri Feb 14 09:56:02 CET 2014
hw/xquartz/quartzCocoa.m | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f34dc7fa96457ea6a0703493d74e63cca357712e
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Fri Feb 14 00:31:38 2014 -0800
XQuartz: pointer -> void *
Fix build regression from 60014a4a98ff924ae7f6840781f768c1cc93bbab
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m
index db2b3cf..d21fb7d 100644
--- a/hw/xquartz/quartzCocoa.m
+++ b/hw/xquartz/quartzCocoa.m
@@ -48,9 +48,9 @@
* Clean out any autoreleased objects.
*/
void
-QuartzBlockHandler(pointer blockData,
+QuartzBlockHandler(void *blockData,
OSTimePtr pTimeout,
- pointer pReadmask)
+ void *pReadmask)
{
static NSAutoreleasePool *aPool = nil;
@@ -62,9 +62,9 @@ QuartzBlockHandler(pointer blockData,
* QuartzWakeupHandler
*/
void
-QuartzWakeupHandler(pointer blockData,
+QuartzWakeupHandler(void *blockData,
int result,
- pointer pReadmask)
+ void *pReadmask)
{
// nothing here
}
More information about the xorg-commit
mailing list