diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
| commit | 67599026d01692c52276df6ff5e8332d2413c18f (patch) | |
| tree | b93b8d6643dd6438f0844d48008d6cb9ffee405f /nx-X11/programs/Xserver/os/log.c | |
| parent | 5a8f1e921b4cafedc9efac22d5fbd2ce05e45ba9 (diff) | |
| parent | cf8797c3c0e9623e5092a2c9f5ea7cb31bc11657 (diff) | |
| download | nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.gz nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.bz2 nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.zip | |
Merge branch 'uli42-pr/various3' into 3.6.x
Attributes GH PR #880: https://github.com/ArcticaProject/nx-libs/pull/880
Diffstat (limited to 'nx-X11/programs/Xserver/os/log.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/log.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 0ead6e9f0..3ec3a2779 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -117,10 +117,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "site.h" #include "opaque.h" -#ifdef WIN32 -#include <process.h> -#define getpid(x) _getpid(x) -#endif #ifdef NX_TRANS_SOCKET @@ -268,9 +264,7 @@ LogInit(const char *fname, const char *backup) if (saveBuffer && bufferSize > 0) { fwrite(saveBuffer, bufferPos, 1, logFile); fflush(logFile); -#ifndef WIN32 fsync(fileno(logFile)); -#endif } } @@ -398,10 +392,8 @@ LogVWrite(int verb, const char *f, va_list args) fwrite(tmpBuffer, len, 1, logFile); if (logFlush) { fflush(logFile); -#ifndef WIN32 if (logSync) fsync(fileno(logFile)); -#endif } } else if (needBuffer) { /* @@ -730,11 +722,9 @@ ErrorF(const char * f, ...) #ifndef NEED_STRERROR #ifdef SYSV -#if !defined(ISC) || defined(ISC202) || defined(ISC22) #define NEED_STRERROR #endif #endif -#endif #if defined(NEED_STRERROR) && !defined(strerror) extern char *sys_errlist[]; |