Skip to content

N
nx-libs
Commit bee0f13c authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

nxagent: Remove own GetTimeInMillis() implementation

along with the DDXTIME define that has been dropped in Xorg upstream, too. commit 985c34bf06af70a7296db8307899a17347a25558 Author: Adam Jackson <ajax@theobromine.nwnk.net> Date: Thu Jul 20 17:33:13 2006 -0400 Remove the DDXTIME conditional, for being unused.
parent b32a984f
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 32 deletions
nx-X11/config/cf/gnu.cf
View file @ bee0f13c
...@@ -127,7 +127,7 @@ XCOMM Not implemented and will always fail. ...@@ -127,7 +127,7 @@ XCOMM Not implemented and will always fail.
XCOMM i386Architecture XCOMM i386Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt #define OptimizedCDebugFlags DefaultGcc2i386Opt
#define GNUMachineDefines -D__i386__ #define GNUMachineDefines -D__i386__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME #define ServerOSDefines XFree86ServerOSDefines
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#define HasPlugin YES #define HasPlugin YES
#define VendorHasX11R6_3libXext YES #define VendorHasX11R6_3libXext YES
......
nx-X11/config/cf/linux.cf
View file @ bee0f13c
...@@ -683,7 +683,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -683,7 +683,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2AxpOpt # define OptimizedCDebugFlags DefaultGcc2AxpOpt
# endif # endif
# define LinuxMachineDefines -D__alpha__ # define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT
# ifdef UseCompaqMathLibrary # ifdef UseCompaqMathLibrary
# define MathLibrary -lcpml -lm # define MathLibrary -lcpml -lm
...@@ -693,7 +693,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -693,7 +693,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifdef HPArchitecture #ifdef HPArchitecture
# define OptimizedCDebugFlags -O2 GccAliasingArgs # define OptimizedCDebugFlags -O2 GccAliasingArgs
# define LinuxMachineDefines -D__hppa__ # define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* HPArchitecture */ #endif /* HPArchitecture */
...@@ -702,7 +702,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -702,7 +702,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O3 # define OptimizedCDebugFlags -O3
# endif # endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* Arm32Achitecture */ #endif /* Arm32Achitecture */
...@@ -711,7 +711,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -711,7 +711,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O3 # define OptimizedCDebugFlags -O3
# endif # endif
# define LinuxMachineDefines -D__aarch64__ -U__arm -Uarm # define LinuxMachineDefines -D__aarch64__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* Arm64Achitecture */ #endif /* Arm64Achitecture */
...@@ -720,7 +720,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -720,7 +720,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2i386Opt # define OptimizedCDebugFlags DefaultGcc2i386Opt
# endif # endif
# define LinuxMachineDefines -D__i386__ # define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* i386Architecture */ #endif /* i386Architecture */
...@@ -729,7 +729,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -729,7 +729,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O2 GccAliasingArgs # define OptimizedCDebugFlags -O2 GccAliasingArgs
# endif # endif
# define LinuxMachineDefines -D__ia64__ # define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* ia64Architecture */ #endif /* ia64Architecture */
...@@ -738,7 +738,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -738,7 +738,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O2 GccAliasingArgs # define OptimizedCDebugFlags -O2 GccAliasingArgs
# endif # endif
# define LinuxMachineDefines -D__mc68000__ # define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* Mc68020Architecture */ #endif /* Mc68020Architecture */
...@@ -747,7 +747,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -747,7 +747,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2MipsOpt # define OptimizedCDebugFlags DefaultGcc2MipsOpt
# endif # endif
# define LinuxMachineDefines -D__mips__ # define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif #endif
...@@ -756,7 +756,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -756,7 +756,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2MipsOpt # define OptimizedCDebugFlags DefaultGcc2MipsOpt
# endif # endif
# define LinuxMachineDefines -D__MIPSEL__ # define LinuxMachineDefines -D__MIPSEL__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# ifdef Mips64elArchitecture # ifdef Mips64elArchitecture
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
# else # else
...@@ -770,7 +770,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -770,7 +770,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt # define OptimizedCDebugFlags DefaultGcc2Ppc64Opt
# endif # endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__ # define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerOSDefines XFree86ServerOSDefines -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* Ppc64Architecture */ #endif /* Ppc64Architecture */
...@@ -779,7 +779,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -779,7 +779,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2PpcOpt # define OptimizedCDebugFlags DefaultGcc2PpcOpt
# endif # endif
# define LinuxMachineDefines -D__powerpc__ # define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* PpcArchitecture */ #endif /* PpcArchitecture */
...@@ -788,7 +788,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -788,7 +788,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs # define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
# endif # endif
# define LinuxMachineDefines -D__s390__ # define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* s390Architecture */ #endif /* s390Architecture */
...@@ -796,7 +796,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -796,7 +796,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
/*#define DefaultCCOptions -fsigned-char */ /*#define DefaultCCOptions -fsigned-char */
#define OptimizedCDebugFlags -O3 -fomit-frame-pointer #define OptimizedCDebugFlags -O3 -fomit-frame-pointer
#define LinuxMachineDefines -D__s390x__ #define LinuxMachineDefines -D__s390x__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME #define ServerOSDefines XFree86ServerOSDefines
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* s390xArchitecture */ #endif /* s390xArchitecture */
...@@ -805,7 +805,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -805,7 +805,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O2 GccAliasingArgs # define OptimizedCDebugFlags -O2 GccAliasingArgs
# endif # endif
# define LinuxMachineDefines -D__sparc__ # define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define AsVISOption -Av9a # define AsVISOption -Av9a
# ifdef Sparc64Architecture # ifdef Sparc64Architecture
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
...@@ -835,7 +835,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -835,7 +835,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs # define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
# endif # endif
# define LinuxMachineDefines -D__sh__ # define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif #endif
...@@ -844,7 +844,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) ...@@ -844,7 +844,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define OptimizedCDebugFlags DefaultGcc2AMD64Opt # define OptimizedCDebugFlags DefaultGcc2AMD64Opt
# endif # endif
# define LinuxMachineDefines -D__amd64__ # define LinuxMachineDefines -D__amd64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AMD64Architecture */ #endif /* AMD64Architecture */
......
nx-X11/programs/Xserver/hw/nxagent/Millis.c
View file @ bee0f13c
...@@ -29,19 +29,6 @@ ...@@ -29,19 +29,6 @@
#include "Xos.h" #include "Xos.h"
#include "Millis.h" #include "Millis.h"
#ifdef DDXTIME
CARD32 GetTimeInMillis()
{
struct timeval ts;
X_GETTIMEOFDAY(&ts);
return(ts.tv_sec * 1000) + (ts.tv_usec / 1000);
}
#endif
const char *GetTimeAsString() const char *GetTimeAsString()
{ {
char *value; char *value;
......
nx-X11/programs/Xserver/hw/nxagent/Millis.h
View file @ bee0f13c
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
#include "Xmd.h" #include "Xmd.h"
CARD32 GetTimeInMillis(void);
const char *GetTimeInMillisAsString(void); const char *GetTimeInMillisAsString(void);
const char *GetTimeAsString(void); const char *GetTimeAsString(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment