1 diff -Nurp -x '*~' -x '*.orig' record/record.c record/record.c

     2 --- record/record.c	2010-07-14 13:23:17.000000000 -0700

     3 +++ record/record.c	2010-09-03 16:45:46.118590143 -0700

     4 @@ -1467,6 +1467,9 @@ typedef struct

     5      short first, last;	/* if for extension, major opcode interval */

     6  } SetInfoRec, *SetInfoPtr;

     7  

     8 +#undef ERR /* protect against #define ERR in <sys/regset.h> on Solaris x86,

     9 +	      which gets included indirectly via #include <stdlib.h> */

    10 +

    11  /* These constant are used to index into an array of SetInfoRec. */

    12  enum {REQ,	/* set info for requests */

    13        REP,	/* set info for replies */