summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-12-23 21:40:21 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-12-23 21:40:21 -0800
commit89bbd07e9ddd688df81405151f9c6284fa3367a8 (patch)
tree672afef27c13aa8a949a2906f368491c7f39b176
parent8dc3a7d6817b7371bbfece1108ef856788256853 (diff)
Remove obsolete XF86_DATE & xf86Date.h
-rw-r--r--hw/xfree86/common/Makefile.am1
-rw-r--r--hw/xfree86/common/xf86Date.h36
-rw-r--r--hw/xfree86/common/xf86Init.c3
3 files changed, 1 insertions, 39 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index b562e6665..d49ef6f1c 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -75,13 +75,12 @@ EXTRA_DIST = \
xf86str.h \
xf86xv.h \
xf86xvmc.h \
xf86xvpriv.h \
xisb.h \
xorgVersion.h \
- xf86Date.h \
$(MODEDEFSOURCES) \
modeline2c.awk \
$(DISTKBDSOURCES)
if LNXACPI
XORG_CFLAGS += -DHAVE_ACPI
diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h
deleted file mode 100644
index 978c4fa15..000000000
--- a/hw/xfree86/common/xf86Date.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 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).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef XF86_DATE
-
-#define XF86_DATE "18 December 2003"
-
-#endif
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 993262ef7..918acb9cf 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -64,13 +64,12 @@
#define XF86_OS_PRIVS
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Config.h"
#include "xf86_OSlib.h"
#include "xorgVersion.h"
-#include "xf86Date.h"
#include "xf86Build.h"
#include "mipointer.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include "xf86DDC.h"
#include "xf86Xinput.h"
@@ -171,13 +170,13 @@ xf86PrintBanner(void)
#endif
#ifdef XORG_CUSTOM_VERSION
ErrorF(" (%s)", XORG_CUSTOM_VERSION);
#endif
#ifndef XORG_DATE
-#define XORG_DATE XF86_DATE
+# define XORG_DATE "Unknown"
#endif
ErrorF("\nRelease Date: %s\n", XORG_DATE);
ErrorF("X Protocol Version %d, Revision %d\n",
X_PROTOCOL, X_PROTOCOL_REVISION);
ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR);
#ifdef HAS_UTSNAME