diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
| commit | 9b51c6da8bffdd67353b1e1245698a7eac478481 (patch) | |
| tree | cde44c263cb1756fae5b4a83facb3c0cdfa474e4 /xorg-server/hw/xquartz/quartzCommon.h | |
| parent | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (diff) | |
| parent | ec617f09d07e32d6f57c0da133f53ad3d43a568a (diff) | |
| download | vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.gz vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.bz2 vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xquartz/quartzCommon.h')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzCommon.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/xquartz/quartzCommon.h b/xorg-server/hw/xquartz/quartzCommon.h index e12e1d25c..813bc7713 100644 --- a/xorg-server/hw/xquartz/quartzCommon.h +++ b/xorg-server/hw/xquartz/quartzCommon.h @@ -40,15 +40,15 @@ // Other shared data extern DevPrivateKeyRec quartzScreenKeyRec; - #define quartzScreenKey (&quartzScreenKeyRec) extern int aquaMenuBarHeight; // Name of GLX bundle for native OpenGL -extern const char *quartzOpenGLBundle; +extern const char *quartzOpenGLBundle; -void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, - pointer pReadmask); -void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask); +void +QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask); +void +QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask); -#endif /* _QUARTZCOMMON_H */ +#endif /* _QUARTZCOMMON_H */ |