This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit bee0f13ce4ebc475b1727c5715e8222c0e472a78 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Apr 29 15:37:10 2019 +0200 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. --- nx-X11/config/cf/gnu.cf | 2 +- nx-X11/config/cf/linux.cf | 32 ++++++++++++++--------------- nx-X11/programs/Xserver/hw/nxagent/Millis.c | 13 ------------ nx-X11/programs/Xserver/hw/nxagent/Millis.h | 2 -- 4 files changed, 17 insertions(+), 32 deletions(-) diff --git a/nx-X11/config/cf/gnu.cf b/nx-X11/config/cf/gnu.cf index d57580125..a1d564569 100644 --- a/nx-X11/config/cf/gnu.cf +++ b/nx-X11/config/cf/gnu.cf @@ -127,7 +127,7 @@ XCOMM Not implemented and will always fail. XCOMM i386Architecture #define OptimizedCDebugFlags DefaultGcc2i386Opt #define GNUMachineDefines -D__i386__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +#define ServerOSDefines XFree86ServerOSDefines #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #define HasPlugin YES #define VendorHasX11R6_3libXext YES diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index fe8d97ec3..c3e9eaafd 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -683,7 +683,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2AxpOpt # endif # define LinuxMachineDefines -D__alpha__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT # ifdef UseCompaqMathLibrary # define MathLibrary -lcpml -lm @@ -693,7 +693,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #ifdef HPArchitecture # define OptimizedCDebugFlags -O2 GccAliasingArgs # define LinuxMachineDefines -D__hppa__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* HPArchitecture */ @@ -702,7 +702,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O3 # endif # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Arm32Achitecture */ @@ -711,7 +711,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O3 # endif # define LinuxMachineDefines -D__aarch64__ -U__arm -Uarm -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* Arm64Achitecture */ @@ -720,7 +720,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2i386Opt # endif # define LinuxMachineDefines -D__i386__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* i386Architecture */ @@ -729,7 +729,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O2 GccAliasingArgs # endif # define LinuxMachineDefines -D__ia64__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* ia64Architecture */ @@ -738,7 +738,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O2 GccAliasingArgs # endif # define LinuxMachineDefines -D__mc68000__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Mc68020Architecture */ @@ -747,7 +747,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2MipsOpt # endif # define LinuxMachineDefines -D__mips__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif @@ -756,7 +756,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2MipsOpt # endif # define LinuxMachineDefines -D__MIPSEL__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # ifdef Mips64elArchitecture # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 # else @@ -770,7 +770,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2Ppc64Opt # endif # define LinuxMachineDefines -D__powerpc64__ -D__powerpc__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerOSDefines XFree86ServerOSDefines -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* Ppc64Architecture */ @@ -779,7 +779,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2PpcOpt # endif # define LinuxMachineDefines -D__powerpc__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* PpcArchitecture */ @@ -788,7 +788,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs # endif # define LinuxMachineDefines -D__s390__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* s390Architecture */ @@ -796,7 +796,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) /*#define DefaultCCOptions -fsigned-char */ #define OptimizedCDebugFlags -O3 -fomit-frame-pointer #define LinuxMachineDefines -D__s390x__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +#define ServerOSDefines XFree86ServerOSDefines #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* s390xArchitecture */ @@ -805,7 +805,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O2 GccAliasingArgs # endif # define LinuxMachineDefines -D__sparc__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define AsVISOption -Av9a # ifdef Sparc64Architecture # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 @@ -835,7 +835,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs # endif # define LinuxMachineDefines -D__sh__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif @@ -844,7 +844,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define OptimizedCDebugFlags DefaultGcc2AMD64Opt # endif # define LinuxMachineDefines -D__amd64__ -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AMD64Architecture */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Millis.c b/nx-X11/programs/Xserver/hw/nxagent/Millis.c index ba801b62a..d3eb09a66 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Millis.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Millis.c @@ -29,19 +29,6 @@ #include "Xos.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() { char *value; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Millis.h b/nx-X11/programs/Xserver/hw/nxagent/Millis.h index 1e76ccbfb..3ba88ae63 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Millis.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Millis.h @@ -28,8 +28,6 @@ #include "Xmd.h" -CARD32 GetTimeInMillis(void); - const char *GetTimeInMillisAsString(void); const char *GetTimeAsString(void); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git