diff options
| author | Adam Jackson <ajax@theobromine.nwnk.net> | 2006-07-20 17:33:13 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@theobromine.nwnk.net> | 2006-07-20 17:33:13 -0400 |
| commit | 985c34bf06af70a7296db8307899a17347a25558 (patch) | |
| tree | b52bd1759bd1893376d9ba8979c04a7c7300df44 /hw/xnest | |
| parent | 84683f19b4d1c712281036bcabf8dc623e64b26a (diff) | |
Remove the DDXTIME conditional, for being unused.
Diffstat (limited to 'hw/xnest')
| -rw-r--r-- | hw/xnest/GetTime.c | 51 | ||||
| -rw-r--r-- | hw/xnest/Makefile.am | 1 |
2 files changed, 0 insertions, 52 deletions
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 <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 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 \ |