[PATCH:intel-gpu-tools 2/4] Rename NOPID to NO_PID to avoid conflict with Solaris NOPID

Alan Coopersmith alan.coopersmith at oracle.com
Fri Aug 24 14:02:02 PDT 2012


Solaris <sys/types.h> already has #define NOPID (pid_t)(-1)

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 lib/intel_reg.h          |    2 +-
 tools/intel_reg_dumper.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/intel_reg.h b/lib/intel_reg.h
index ffded64..c09343a 100644
--- a/lib/intel_reg.h
+++ b/lib/intel_reg.h
@@ -428,7 +428,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # define I830_PRIMARY_RING_1_DONE	(1 << 1)
 # define I830_PRIMARY_RING_0_DONE	(1 << 0)
 
-#define NOPID                    0x2094
+#define NO_PID                   0x2094
 
 #define SCPD0                    0x209c	/* debug */
 #define INST_PS                  0x20c4
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index a994f00..6505033 100644
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -1897,7 +1897,7 @@ static struct reg_debug i945gm_mi_regs[] = {
 	DEFINEREG(IPEIR),
 	DEFINEREG(IPEHR),
 	DEFINEREG(INST_DONE),
-	DEFINEREG(NOPID),
+	DEFINEREG(NO_PID),
 	DEFINEREG(HWSTAM),
 	DEFINEREG(SCPD0),
 	DEFINEREG(IER),
-- 
1.7.9.2



More information about the xorg-devel mailing list