From 985c34bf06af70a7296db8307899a17347a25558 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 20 Jul 2006 17:33:13 -0400 Subject: [PATCH] Remove the DDXTIME conditional, for being unused. --- 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(-) delete mode 100644 hw/xnest/GetTime.c diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index e7f04df16..9c5356ed5 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 212f79b7c..46e956ca1 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -450,17 +450,6 @@ ddxProcessArgument(int argc, char *argv[], int i) 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 4dbbd7e93..318b24584 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 bdcc6beae..000000000 --- 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 -#endif - -#include -#include "os.h" -#include - -#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 b23782eb9..b237788bc 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 d4c0b9a4c..e182ea116 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 c5242cc6f..816dec9ed 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 de3e7c9ec..3900bffa2 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)