xserver: Branch 'master' - 2 commits
Adam Jackson
ajax at kemper.freedesktop.org
Tue Oct 6 08:52:37 PDT 2015
hw/xfree86/os-support/xf86_OSlib.h | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 8a26a4aff570744347a8bed19f693bf631be464e
Author: Alexandr Shadchin <alexandr.shadchin at gmail.com>
Date: Sun Nov 27 02:49:02 2011 +0600
bsd: Remove LINKKIT
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 946d58a..c7b295a 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -238,8 +238,6 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
#define __FreeBSD_kernel_version __FreeBSD_version
#endif
-#if !defined(LINKKIT)
- /* Don't need this stuff for the Link Kit */
#ifdef SYSCONS_SUPPORT
#define COMPAT_SYSCONS
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
@@ -305,7 +303,6 @@ struct pcvtid {
#ifndef CONSOLE_GET_MEM_INFO
#define CONSOLE_GET_MEM_INFO _IOR('t',159,struct map_info)
#endif
-#endif /* !LINKKIT */
#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
#include <machine/sysarch.h>
commit ab3e34bf9ddff90261fbbe0e2604887459cd70ad
Author: Alexandr Shadchin <alexandr.shadchin at gmail.com>
Date: Sun Nov 27 02:49:01 2011 +0600
xfree86: Remove 386BSD
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 95c3a73..946d58a 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -208,13 +208,9 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
#endif /* __linux__ || __GLIBC__ */
/**************************************************************************/
-/* 386BSD and derivatives, BSD/386 */
+/* System is BSD-like */
/**************************************************************************/
-#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__))
-#undef __386BSD__
-#endif
-
#ifdef CSRG_BASED
#include <sys/ioctl.h>
#include <signal.h>
More information about the xorg-commit
mailing list