Remove the DDXTIME conditional, for being unused.
This commit is contained in:
parent
84683f19b4
commit
985c34bf06
|
@ -1046,14 +1046,3 @@ void ddxUseMsg(void)
|
||||||
ErrorF(" Ctrl-Alt-q Quit (core devices only)\n");
|
ErrorF(" Ctrl-Alt-q Quit (core devices only)\n");
|
||||||
ErrorF(" Ctrl-Alt-F* Switch to VC (local 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
|
|
||||||
|
|
|
@ -450,17 +450,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
|
||||||
return 0;
|
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 ColormapPtr InstalledMaps[MAXSCREENS];
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
|
@ -470,32 +470,3 @@ searchdone:
|
||||||
}
|
}
|
||||||
return (Success);
|
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 */
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
|
@ -14,7 +14,6 @@ SRCS = Args.c \
|
||||||
GC.c \
|
GC.c \
|
||||||
GCOps.c \
|
GCOps.c \
|
||||||
GCOps.h \
|
GCOps.h \
|
||||||
GetTime.c \
|
|
||||||
Handlers.c \
|
Handlers.c \
|
||||||
Handlers.h \
|
Handlers.h \
|
||||||
Init.c \
|
Init.c \
|
||||||
|
|
|
@ -245,17 +245,6 @@ ddxBeforeReset(void)
|
||||||
}
|
}
|
||||||
#endif
|
#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 */
|
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
|
||||||
void ddxInitGlobals(void)
|
void ddxInitGlobals(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -944,15 +944,6 @@ void ddxInitGlobals(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DDXTIME /* from ServerOSDefines */
|
|
||||||
CARD32
|
|
||||||
GetTimeInMillis (void)
|
|
||||||
{
|
|
||||||
return GetTickCount ();
|
|
||||||
}
|
|
||||||
#endif /* DDXTIME */
|
|
||||||
|
|
||||||
|
|
||||||
/* See Porting Layer Definition - p. 20 */
|
/* See Porting Layer Definition - p. 20 */
|
||||||
/*
|
/*
|
||||||
* Do any global initialization, then initialize each screen.
|
* Do any global initialization, then initialize each screen.
|
||||||
|
|
|
@ -545,7 +545,6 @@ GiveUp(int sig)
|
||||||
errno = olderrno;
|
errno = olderrno;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef DDXTIME
|
|
||||||
_X_EXPORT CARD32
|
_X_EXPORT CARD32
|
||||||
GetTimeInMillis(void)
|
GetTimeInMillis(void)
|
||||||
{
|
{
|
||||||
|
@ -554,7 +553,6 @@ GetTimeInMillis(void)
|
||||||
X_GETTIMEOFDAY(&tp);
|
X_GETTIMEOFDAY(&tp);
|
||||||
return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
|
return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
_X_EXPORT void
|
_X_EXPORT void
|
||||||
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
|
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user