frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove xf86Version.h and related API. 

We haven't meaningfully been API-compatible with xf86 modules in ages,
let's stop pretending.
This commit is contained in:
Adam Jackson 2008-08-13 11:09:54 -04:00
parent 139c3ab7b7
commit 544bfd0666
7 changed files with 1 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/Makefile.am
View File

@ -47,7 +47,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
$(XVSDKINCS) xf86Version.h xorgVersion.h \
$(XVSDKINCS) xorgVersion.h \
xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
DISTCLEANFILES = xf86Build.h

1
hw/xfree86/common/xf86.h
View File

@ -277,7 +277,6 @@ Bool xf86GetModInDevEnabled(void);
Bool xf86GetAllowMouseOpenFail(void);
Bool xf86IsPc98(void);
void xf86DisableRandR(void);
CARD32 xf86GetVersion(void);
CARD32 xorgGetVersion(void);
CARD32 xf86GetModuleVersion(pointer module);
pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);

7
hw/xfree86/common/xf86Helper.c
View File

@ -60,7 +60,6 @@
#include "mivalidate.h"
#include "xf86RAC.h"
#include "xf86Bus.h"
#include "xf86Version.h"
/* For xf86GetClocks */
#if defined(CSRG_BASED) || defined(__GNU__)
@ -2351,12 +2350,6 @@ xf86DisableRandR()
xf86Info.randRFrom = X_PROBED;
}
_X_EXPORT CARD32
xf86GetVersion()
{
return XF86_VERSION_CURRENT;
}
_X_EXPORT CARD32
xf86GetModuleVersion(pointer module)
{

1
hw/xfree86/common/xf86Module.h
View File

@ -42,7 +42,6 @@
#define _XF86MODULE_H
#include "misc.h"
#include "xf86Version.h"
#ifndef NULL
#define NULL ((void *)0)
#endif

56
hw/xfree86/common/xf86Version.h
View File

@ -1,56 +0,0 @@
/*
* Copyright (c) 1994-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
*
* Except as contained in this notice, the name of the copyright holder(s)
* and author(s) shall not be used in advertising or otherwise to promote
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
#ifndef XF86_VERSION_CURRENT
#define XF86_VERSION_MAJOR 4
#define XF86_VERSION_MINOR 3
#define XF86_VERSION_PATCH 99
#define XF86_VERSION_SNAP 902
/* This has five arguments for compatibilty reasons */
#define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
#define XF86_GET_MAJOR_VERSION(vers) ((vers) / 10000000)
#define XF86_GET_MINOR_VERSION(vers) (((vers) % 10000000) / 100000)
#define XF86_GET_PATCH_VERSION(vers) (((vers) % 100000) / 1000)
#define XF86_GET_SNAP_VERSION(vers) ((vers) % 1000)
/* Define these for compatibility. They'll be removed at some point. */
#define XF86_VERSION_SUBMINOR XF86_VERSION_PATCH
#define XF86_VERSION_BETA 0
#define XF86_VERSION_ALPHA XF86_VERSION_SNAP
#define XF86_VERSION_CURRENT \
XF86_VERSION_NUMERIC(XF86_VERSION_MAJOR, \
XF86_VERSION_MINOR, \
XF86_VERSION_PATCH, \
XF86_VERSION_SNAP, \
0)
#endif

1
hw/xfree86/common/xisb.c
View File

@ -41,7 +41,6 @@
#include <misc.h>
#include <xf86.h>
#include <xf86Version.h>
#include <xf86_OSproc.h>
#include <xf86_OSlib.h>
#include <xf86Xinput.h>

1
hw/xfree86/loader/xf86sym.c
View File

@ -445,7 +445,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86IsPc98)
SYMFUNC(xf86DisableRandR)
SYMFUNC(xf86GetRotation)
SYMFUNC(xf86GetVersion)
SYMFUNC(xf86GetModuleVersion)
SYMFUNC(xf86GetClocks)
SYMFUNC(xf86SetPriority)