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

Bugzilla #817

This commit is contained in:
Rik Faith 2004-07-07 04:32:52 +00:00
parent 1498d7a096
commit a5c9b3229c
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dmx/dmxinit.c
View File

@ -1048,6 +1048,7 @@ void ddxUseMsg(void)
ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n"); ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n");
} }
#ifdef DDXTIME
/** Return wall-clock time in milliseconds. */ /** Return wall-clock time in milliseconds. */
CARD32 GetTimeInMillis(void) CARD32 GetTimeInMillis(void)
{ {
@ -1056,3 +1057,4 @@ CARD32 GetTimeInMillis(void)
gettimeofday(&tp, 0); gettimeofday(&tp, 0);
return tp.tv_sec * 1000 + tp.tv_usec / 1000; return tp.tv_sec * 1000 + tp.tv_usec / 1000;
} }
#endif

2
hw/dmx/glxProxy/glxsingle.c
View File

@ -60,7 +60,7 @@
* this is because the GL single opcodes has different naming convension * this is because the GL single opcodes has different naming convension
* the other X opcodes (ie. X_GLsop_GetFloatv). * the other X opcodes (ie. X_GLsop_GetFloatv).
*/ */
#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
#define GetReqSingle(name, req) \ #define GetReqSingle(name, req) \
WORD64ALIGN\ WORD64ALIGN\
if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\ if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\

2
hw/dmx/glxProxy/glxvendor.c
View File

@ -59,7 +59,7 @@
* this is because the GL single opcodes has different naming convension * this is because the GL single opcodes has different naming convension
* the other X opcodes (ie. X_GLsop_GetFloatv). * the other X opcodes (ie. X_GLsop_GetFloatv).
*/ */
#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
#define GetReqVendorPrivate(name, req) \ #define GetReqVendorPrivate(name, req) \
WORD64ALIGN\ WORD64ALIGN\
if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\ if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\

2
hw/dmx/input/dmxinputinit.c
View File

@ -177,7 +177,7 @@ static DMXLocalInputInfoRec DMXLocalDevices[] = {
ps2LinuxRead ps2LinuxRead
}, },
#endif #endif
#ifndef __sgi #ifdef __linux__
/* USB drivers, currently only for /* USB drivers, currently only for
Linux, but relatively easy to port to Linux, but relatively easy to port to
other OSs */ other OSs */

8
hw/dmx/input/dmxsigio.c
View File

@ -42,14 +42,18 @@
#include "dmxevents.h" #include "dmxevents.h"
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <sys/fcntl.h> #include <fcntl.h>
static int dmxFdCount = 0; static int dmxFdCount = 0;
static Bool dmxInputEnabled = TRUE; static Bool dmxInputEnabled = TRUE;
/* Define equivalents for non-POSIX systems (e.g., SGI IRIX) */ /* Define equivalents for non-POSIX systems (e.g., SGI IRIX, Solaris) */
#ifndef O_ASYNC #ifndef O_ASYNC
# ifdef FASYNC
# define O_ASYNC FASYNC # define O_ASYNC FASYNC
# else
# define O_ASYNC 0
# endif
#endif #endif
#ifndef O_NONBLOCK #ifndef O_NONBLOCK
#define O_NONBLOCK FNONBLK #define O_NONBLOCK FNONBLK