frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix os/utils.c compile with mingw.

This commit is contained in:
Luo Jie 2007-05-24 11:02:28 -07:00 committed by Eric Anholt
parent 1f48995d66
commit 0b98845046
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os/utils.c
View File

@ -64,8 +64,10 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xos.h> #include <X11/Xos.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#if !defined(WIN32) || !defined(__MINGW32__)
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#endif
#include "misc.h" #include "misc.h"
#include <X11/X.h> #include <X11/X.h>
#define XSERV_t #define XSERV_t
@ -527,6 +529,13 @@ GiveUp(int sig)
errno = olderrno; errno = olderrno;
} }
#if defined WIN32 && defined __MINGW32__
_X_EXPORT CARD32
GetTimeInMillis (void)
{
return GetTickCount ();
}
#else
_X_EXPORT CARD32 _X_EXPORT CARD32
GetTimeInMillis(void) GetTimeInMillis(void)
{ {
@ -541,6 +550,7 @@ GetTimeInMillis(void)
X_GETTIMEOFDAY(&tv); X_GETTIMEOFDAY(&tv);
return(tv.tv_sec * 1000) + (tv.tv_usec / 1000); return(tv.tv_sec * 1000) + (tv.tv_usec / 1000);
} }
#endif
_X_EXPORT void _X_EXPORT void
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay) AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
@ -798,11 +808,13 @@ ProcessCommandLine(int argc, char *argv[])
} }
else if ( strcmp( argv[i], "-core") == 0) else if ( strcmp( argv[i], "-core") == 0)
{ {
struct rlimit core_limit;
CoreDump = TRUE; CoreDump = TRUE;
#if !defined(WIN32) || !defined(__MINGW32__)
struct rlimit core_limit;
getrlimit (RLIMIT_CORE, &core_limit); getrlimit (RLIMIT_CORE, &core_limit);
core_limit.rlim_cur = core_limit.rlim_max; core_limit.rlim_cur = core_limit.rlim_max;
setrlimit (RLIMIT_CORE, &core_limit); setrlimit (RLIMIT_CORE, &core_limit);
#endif
} }
else if ( strcmp( argv[i], "-dpi") == 0) else if ( strcmp( argv[i], "-dpi") == 0)
{ {