XQuartz: Fix compilation warnings with XPLUGIN_VERSION >= 4
xprAppleWM.c:143: warning: initialization from incompatible pointer type xprAppleWM.c:144: warning: initialization from incompatible pointer type Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
6128544fd5
commit
d79cc14a51
|
@ -32,10 +32,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#define _APPLEWMEXT_H_
|
#define _APPLEWMEXT_H_
|
||||||
|
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
|
#include <Xplugin.h>
|
||||||
|
|
||||||
typedef int (*DisableUpdateProc)(void);
|
typedef int (*DisableUpdateProc)(void);
|
||||||
typedef int (*EnableUpdateProc)(void);
|
typedef int (*EnableUpdateProc)(void);
|
||||||
typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);
|
typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level);
|
||||||
|
#if XPLUGIN_VERSION < 4
|
||||||
typedef int (*FrameGetRectProc)(int type, int class, const BoxRec *outer,
|
typedef int (*FrameGetRectProc)(int type, int class, const BoxRec *outer,
|
||||||
const BoxRec *inner, BoxRec *ret);
|
const BoxRec *inner, BoxRec *ret);
|
||||||
typedef int (*FrameHitTestProc)(int class, int x, int y,
|
typedef int (*FrameHitTestProc)(int class, int x, int y,
|
||||||
|
@ -45,6 +47,17 @@ typedef int (*FrameDrawProc)(WindowPtr pWin, int class, unsigned int attr,
|
||||||
const BoxRec *outer, const BoxRec *inner,
|
const BoxRec *outer, const BoxRec *inner,
|
||||||
unsigned int title_len,
|
unsigned int title_len,
|
||||||
const unsigned char *title_bytes);
|
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,
|
||||||
|
const BoxRec *outer,
|
||||||
|
const BoxRec *inner, int *ret);
|
||||||
|
typedef int (*FrameDrawProc)(WindowPtr pWin, xp_frame_class class, xp_frame_attr 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 (*SendPSNProc)(uint32_t hi, uint32_t lo);
|
||||||
typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);
|
typedef int (*AttachTransientProc)(WindowPtr pWinChild, WindowPtr pWinParent);
|
||||||
|
|
||||||
|
|
|
@ -114,8 +114,8 @@ static int xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) {
|
||||||
|
|
||||||
static int xprFrameDraw(
|
static int xprFrameDraw(
|
||||||
WindowPtr pWin,
|
WindowPtr pWin,
|
||||||
int class,
|
xp_frame_class class,
|
||||||
unsigned int attr,
|
xp_frame_attr attr,
|
||||||
const BoxRec *outer,
|
const BoxRec *outer,
|
||||||
const BoxRec *inner,
|
const BoxRec *inner,
|
||||||
unsigned int title_len,
|
unsigned int title_len,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user