xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Wed Aug 13 08:20:34 PDT 2008
hw/xfree86/common/Makefile.am | 2 -
hw/xfree86/common/xf86.h | 1
hw/xfree86/common/xf86Helper.c | 7 -----
hw/xfree86/common/xf86Module.h | 1
hw/xfree86/common/xf86Version.h | 56 ----------------------------------------
hw/xfree86/common/xisb.c | 1
hw/xfree86/loader/xf86sym.c | 1
7 files changed, 1 insertion(+), 68 deletions(-)
New commits:
commit 544bfd06663ff71bc5275459cf74a3557530544f
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Aug 13 11:09:54 2008 -0400
Remove xf86Version.h and related API.
We haven't meaningfully been API-compatible with xf86 modules in ages,
let's stop pretending.
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 15b56fa..de14dbb 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -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
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index cd6da59..6c3c095 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -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);
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index d358da0..0dd7fc7 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -60,7 +60,6 @@
#include "mivalidate.h"
#include "xf86RAC.h"
#include "xf86Bus.h"
-#include "xf86Version.h"
/* For xf86GetClocks */
#if defined(CSRG_BASED) || defined(__GNU__)
@@ -2352,12 +2351,6 @@ xf86DisableRandR()
}
_X_EXPORT CARD32
-xf86GetVersion()
-{
- return XF86_VERSION_CURRENT;
-}
-
-_X_EXPORT CARD32
xf86GetModuleVersion(pointer module)
{
return (CARD32)LoaderGetModuleVersion(module);
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 3c75df0..415d095 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -42,7 +42,6 @@
#define _XF86MODULE_H
#include "misc.h"
-#include "xf86Version.h"
#ifndef NULL
#define NULL ((void *)0)
#endif
diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h
deleted file mode 100644
index b93ac7d..0000000
--- a/hw/xfree86/common/xf86Version.h
+++ /dev/null
@@ -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
diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
index d021ec1..6314094 100644
--- a/hw/xfree86/common/xisb.c
+++ b/hw/xfree86/common/xisb.c
@@ -41,7 +41,6 @@
#include <misc.h>
#include <xf86.h>
-#include <xf86Version.h>
#include <xf86_OSproc.h>
#include <xf86_OSlib.h>
#include <xf86Xinput.h>
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 7ff17ef..3d6ca7b 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -445,7 +445,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86IsPc98)
SYMFUNC(xf86DisableRandR)
SYMFUNC(xf86GetRotation)
- SYMFUNC(xf86GetVersion)
SYMFUNC(xf86GetModuleVersion)
SYMFUNC(xf86GetClocks)
SYMFUNC(xf86SetPriority)
More information about the xorg-commit
mailing list