diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-05-11 09:41:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-05-11 09:41:15 +0200 |
| commit | 22649369085dfaa351003ba76b7838160089f7cc (patch) | |
| tree | 1c83284c7be0c038601cfc41ad53ce9351b2e70a /nx-X11/programs/Xserver/hw/nxagent/Millis.c | |
| parent | f6177d2adb9540134bf7e760fd7df4599e98a713 (diff) | |
| parent | fac36b24f55b02040bd6950d8de0385fdbb33703 (diff) | |
| download | nx-libs-22649369085dfaa351003ba76b7838160089f7cc.tar.gz nx-libs-22649369085dfaa351003ba76b7838160089f7cc.tar.bz2 nx-libs-22649369085dfaa351003ba76b7838160089f7cc.zip | |
Merge branch 'uli42-pr/small_fixes' into 3.6.x
Attributes GH PR #797: https://github.com/ArcticaProject/nx-libs/pull/797
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Millis.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Millis.c | 13 |
1 files changed, 0 insertions, 13 deletions
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; |