xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Thu Jul 20 15:35:13 PDT 2006
hw/dmx/dmxinit.c | 11 ---------
hw/vfb/InitOutput.c | 11 ---------
hw/xfree86/common/xf86Io.c | 29 -------------------------
hw/xnest/GetTime.c | 51 ---------------------------------------------
hw/xnest/Makefile.am | 1
hw/xprint/ddxInit.c | 11 ---------
hw/xwin/InitOutput.c | 9 -------
os/utils.c | 2 -
8 files changed, 125 deletions(-)
New commits:
diff-tree 985c34bf06af70a7296db8307899a17347a25558 (from 84683f19b4d1c712281036bcabf8dc623e64b26a)
Author: Adam Jackson <ajax at theobromine.nwnk.net>
Date: Thu Jul 20 17:33:13 2006 -0400
Remove the DDXTIME conditional, for being unused.
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index e7f04df..9c5356e 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -1046,14 +1046,3 @@ void ddxUseMsg(void)
ErrorF(" Ctrl-Alt-q Quit (core devices only)\n");
ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n");
}
-
-#ifdef DDXTIME
-/** Return wall-clock time in milliseconds. */
-CARD32 GetTimeInMillis(void)
-{
- struct timeval tp;
-
- gettimeofday(&tp, 0);
- return tp.tv_sec * 1000 + tp.tv_usec / 1000;
-}
-#endif
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 212f79b..46e956c 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -450,17 +450,6 @@ ddxProcessArgument(int argc, char *argv[
return 0;
}
-#ifdef DDXTIME /* from ServerOSDefines */
-CARD32
-GetTimeInMillis()
-{
- struct timeval tp;
-
- X_GETTIMEOFDAY(&tp);
- return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-}
-#endif
-
static ColormapPtr InstalledMaps[MAXSCREENS];
static int
diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c
index 4dbbd7e..318b245 100644
--- a/hw/xfree86/common/xf86Io.c
+++ b/hw/xfree86/common/xf86Io.c
@@ -470,32 +470,3 @@ searchdone:
}
return (Success);
}
-
-#if defined(DDXTIME) && !defined(QNX4)
-/*
- * These are getting tossed in here until I can think of where
- * they really belong
- */
-#define HALFMONTH ((unsigned long) 1<<31)
-_X_EXPORT CARD32
-GetTimeInMillis()
-{
- struct timeval tp;
- register CARD32 val;
- register INT32 diff;
- static CARD32 oldval = 0;
- static CARD32 time = 0;
-
- gettimeofday(&tp, 0);
- val = (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
- if (oldval) {
- diff = val - oldval;
- if (diff > 0)
- time += diff;
- }
- oldval = val;
-
- return time;
-}
-#endif /* DDXTIME && !QNX4 */
-
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
deleted file mode 100644
index bdcc6be..0000000
--- a/hw/xnest/GetTime.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Xorg: GetTime.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
-/*
-
-Copyright (c) 1993 X Consortium
-
-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 X CONSORTIUM 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 X Consortium 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 X Consortium.
-
-*/
-/* $XFree86$ */
-
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
-
-#include <X11/Xos.h>
-#include "os.h"
-#include <time.h>
-
-#ifdef DDXTIME
-CARD32
-GetTimeInMillis()
-{
- struct timeval tp;
-
- X_GETTIMEOFDAY(&tp);
- return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-}
-#endif
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index b23782e..b237788 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -14,7 +14,6 @@ SRCS = Args.c \
GC.c \
GCOps.c \
GCOps.h \
- GetTime.c \
Handlers.c \
Handlers.h \
Init.c \
diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
index d4c0b9a..e182ea1 100644
--- a/hw/xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
@@ -245,17 +245,6 @@ ddxBeforeReset(void)
}
#endif
-#ifdef DDXTIME
-CARD32
-GetTimeInMillis(void)
-{
- struct timeval tp;
-
- X_GETTIMEOFDAY(&tp);
- return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-}
-#endif
-
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void)
{
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index c5242cc..816dec9 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -944,15 +944,6 @@ void ddxInitGlobals(void)
{
}
-#ifdef DDXTIME /* from ServerOSDefines */
-CARD32
-GetTimeInMillis (void)
-{
- return GetTickCount ();
-}
-#endif /* DDXTIME */
-
-
/* See Porting Layer Definition - p. 20 */
/*
* Do any global initialization, then initialize each screen.
diff --git a/os/utils.c b/os/utils.c
index de3e7c9..3900bff 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -545,7 +545,6 @@ GiveUp(int sig)
errno = olderrno;
}
-#ifndef DDXTIME
_X_EXPORT CARD32
GetTimeInMillis(void)
{
@@ -554,7 +553,6 @@ GetTimeInMillis(void)
X_GETTIMEOFDAY(&tp);
return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
}
-#endif
_X_EXPORT void
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
More information about the xorg-commit
mailing list