diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-27 22:12:59 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-27 22:12:59 -0700 |
| commit | 0f284f0f42f26a242eb3153787f2e98b6b88dff8 (patch) | |
| tree | 0325421ded2da36b0918d660af949af2c5dad88c | |
| parent | f6d4e75ec55ac6812f9dead42ecdffb9614578c7 (diff) | |
XQuartz: BuildFix to build correctly with XPLUGIN_VERSION < 4
This fixes a regression introduced by d79cc14a51f3e8d4d2f66aad055092672cab1526
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | hw/xquartz/applewmExt.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/hw/xquartz/applewmExt.h b/hw/xquartz/applewmExt.h index f622f79b4..35c8f8f6d 100644 --- a/hw/xquartz/applewmExt.h +++ b/hw/xquartz/applewmExt.h @@ -34,20 +34,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "window.h" #include <Xplugin.h> +#if XPLUGIN_VERSION < 4 +typedef xp_frame_attr int; +typedef xp_frame_class int; +typedef xp_frame_rect int; +#endif + typedef int (*DisableUpdateProc)(void); typedef int (*EnableUpdateProc)(void); typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level); -#if XPLUGIN_VERSION < 4 -typedef int (*FrameGetRectProc)(int type, int class, const BoxRec *outer, - const BoxRec *inner, BoxRec *ret); -typedef int (*FrameHitTestProc)(int class, int x, int y, - const BoxRec *outer, - const BoxRec *inner, int *ret); -typedef int (*FrameDrawProc)(WindowPtr pWin, int class, unsigned int attr, - const BoxRec *outer, const BoxRec *inner, - unsigned int title_len, - const unsigned char *title_bytes); -#else typedef int (*FrameGetRectProc)(xp_frame_rect type, xp_frame_class class, const BoxRec *outer, const BoxRec *inner, BoxRec *ret); typedef int (*FrameHitTestProc)(xp_frame_class class, int x, int y, @@ -57,7 +52,6 @@ typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class, xp_frame_attr const BoxRec *outer, const BoxRec *inner, unsigned int title_len, const unsigned char *title_bytes); -#endif typedef int (*SendPSNProc)(uint32_t hi, uint32_t lo); typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent); |