Bugzilla #817
This commit is contained in:
parent
1498d7a096
commit
a5c9b3229c
|
@ -1048,6 +1048,7 @@ void ddxUseMsg(void)
|
|||
ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n");
|
||||
}
|
||||
|
||||
#ifdef DDXTIME
|
||||
/** Return wall-clock time in milliseconds. */
|
||||
CARD32 GetTimeInMillis(void)
|
||||
{
|
||||
|
@ -1056,3 +1057,4 @@ CARD32 GetTimeInMillis(void)
|
|||
gettimeofday(&tp, 0);
|
||||
return tp.tv_sec * 1000 + tp.tv_usec / 1000;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
* this is because the GL single opcodes has different naming convension
|
||||
* 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) \
|
||||
WORD64ALIGN\
|
||||
if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
* this is because the GL single opcodes has different naming convension
|
||||
* 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) \
|
||||
WORD64ALIGN\
|
||||
if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
|
||||
|
|
|
@ -177,7 +177,7 @@ static DMXLocalInputInfoRec DMXLocalDevices[] = {
|
|||
ps2LinuxRead
|
||||
},
|
||||
#endif
|
||||
#ifndef __sgi
|
||||
#ifdef __linux__
|
||||
/* USB drivers, currently only for
|
||||
Linux, but relatively easy to port to
|
||||
other OSs */
|
||||
|
|
|
@ -42,14 +42,18 @@
|
|||
#include "dmxevents.h"
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
static int dmxFdCount = 0;
|
||||
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
|
||||
#define O_ASYNC FASYNC
|
||||
# ifdef FASYNC
|
||||
# define O_ASYNC FASYNC
|
||||
# else
|
||||
# define O_ASYNC 0
|
||||
# endif
|
||||
#endif
|
||||
#ifndef O_NONBLOCK
|
||||
#define O_NONBLOCK FNONBLK
|
||||
|
|
Loading…
Reference in New Issue