diff options
Diffstat (limited to 'xorg-server/record')
| -rw-r--r-- | xorg-server/record/record.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c index f728cc684..1b7eb8a43 100644 --- a/xorg-server/record/record.c +++ b/xorg-server/record/record.c @@ -1393,6 +1393,10 @@ typedef struct { short first, last; /* if for extension, major opcode interval */ } SetInfoRec, *SetInfoPtr; +#if defined(ERR) && defined(__sun) +#undef ERR /* Avoid conflict with Solaris <sys/regset.h> */ +#endif + /* These constant are used to index into an array of SetInfoRec. */ enum { REQ, /* set info for requests */ REP, /* set info for replies */ |