XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop obsolete compat macros

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-02 15:40:40 +01:00
committed by Enrico Weigelt
parent 43578845d8
commit da10d3f803
4 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@@ -29,7 +29,6 @@ xgi_drv_la_LDFLAGS = -module -avoid-version
xgi_drv_ladir = @moduledir@/drivers
xgi_drv_la_SOURCES = \
compat-api.h\
init.c \
init.h \
osdef.h \

37
src/compat-api.h
View File

@@ -1,37 +0,0 @@
/*
* Copyright 2012 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
* Author: Dave Airlie <airlied@redhat.com>
*/
#ifndef COMPAT_API_H
#define COMPAT_API_H
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
#define BLOCKHANDLER_ARGS pScreen, pTimeout
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
#endif
#endif

2
src/xgi.h
View File

@@ -154,8 +154,6 @@ extern Bool g_bRunTimeDebug;
#include "vgatypes.h"
#include "vb_struct.h"
#include "compat-api.h"
#include "xf86drm.h"
#include "sarea.h"

4
src/xgi_driver.c
View File

@@ -3802,13 +3802,13 @@ XGIRestore(ScrnInfoPtr pScrn)
/* Our generic BlockHandler for Xv */
static void
XGIBlockHandler(BLOCKHANDLER_ARGS_DECL)
XGIBlockHandler(ScreenPtr pScreen, pointer pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
XGIPtr pXGI = XGIPTR(pScrn);
pScreen->BlockHandler = pXGI->BlockHandler;
(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
(*pScreen->BlockHandler) (pScreen, pTimeout);
pScreen->BlockHandler = XGIBlockHandler;
if (pXGI->VideoTimerCallback) {