diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:32:14 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:32:14 +0200 |
| commit | 9627fd587c9aa066d4ce6e852b26950030f9c3cd (patch) | |
| tree | 50375cab018b3b62076bf4a6a674fca7613db68b /src/lx_display.c | |
| parent | 8b6ec6bb08fa9c3b19753acb436bbb8ecfae9233 (diff) | |
| parent | 7047b6da264e946e77eeee4080d194c807562d68 (diff) | |
Merge remote-tracking branch 'origin/master' into obsdobsd
Diffstat (limited to 'src/lx_display.c')
| -rw-r--r-- | src/lx_display.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lx_display.c b/src/lx_display.c index 2aeb3b4..8ee6443 100644 --- a/src/lx_display.c +++ b/src/lx_display.c @@ -324,7 +324,6 @@ lx_crtc_commit(xf86CrtcPtr crtc) /* Load the cursor */ if (crtc->scrn->pScreen != NULL) { - xf86_reload_cursors(crtc->scrn->pScreen); crtc->funcs->hide_cursor(crtc); crtc->cursor_shown = FALSE; } @@ -389,11 +388,7 @@ lx_create_bo_pixmap(ScreenPtr pScreen, { PixmapPtr pixmap; -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0) pixmap = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth, 0); -#else - pixmap = (*pScreen->CreatePixmap) (pScreen, 0, 0, depth); -#endif if (!pixmap) return NULL; @@ -576,7 +571,7 @@ LXSetupCrtc(ScrnInfoPtr pScrni) return; } - lxpriv = xnfcalloc(1, sizeof(LXCrtcPrivateRec)); + lxpriv = XNFcallocarray(1, sizeof(LXCrtcPrivateRec)); if (!lxpriv) { xf86CrtcDestroy(crtc); |