diff options
| author | Rik Faith <faith@alephnull.com> | 2004-07-07 04:32:52 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2004-07-07 04:32:52 +0000 |
| commit | a5c9b3229ce418a5e3eacc40b7a7f11c0a26d958 (patch) | |
| tree | 3ab0c3fb198339a23f28d31e0f52bdf9f5501f30 /hw/dmx | |
| parent | 1498d7a096f0855fa965585acd9ca4a2780cc959 (diff) | |
Bugzilla #817
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/dmxinit.c | 2 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxsingle.c | 2 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxvendor.c | 2 | ||||
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 2 | ||||
| -rw-r--r-- | hw/dmx/input/dmxsigio.c | 10 |
5 files changed, 12 insertions, 6 deletions
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 72ab1d0f4..71dfb5197 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -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 diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index 40b925a30..d8af1eac7 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -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)\ diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c index 3b6467607..b5b61a5bb 100644 --- a/hw/dmx/glxProxy/glxvendor.c +++ b/hw/dmx/glxProxy/glxvendor.c @@ -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)\ diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index c8af178cf..4dd52ba3c 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -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 */ diff --git a/hw/dmx/input/dmxsigio.c b/hw/dmx/input/dmxsigio.c index 038ff08a0..eb57c6e32 100644 --- a/hw/dmx/input/dmxsigio.c +++ b/hw/dmx/input/dmxsigio.c @@ -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 |