From 9d53f9cfa1c9f9e04f9f3c878a25628af8227b34 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 14 Jul 2010 22:49:07 +0000
Subject: [PATCH] Status -> PStatus

---
 panda/src/pipeline/threadPosixImpl.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/panda/src/pipeline/threadPosixImpl.h b/panda/src/pipeline/threadPosixImpl.h
index e325dd6cd8..339a784b0a 100644
--- a/panda/src/pipeline/threadPosixImpl.h
+++ b/panda/src/pipeline/threadPosixImpl.h
@@ -59,7 +59,8 @@ private:
   static void *root_func(void *data);
   static void init_pt_ptr_index();
 
-  enum Status {
+  // There appears to be a name collision with the word "Status".
+  enum PStatus {
     S_new,
     S_start_called,
     S_running,
@@ -71,7 +72,7 @@ private:
   pthread_t _thread;
   bool _joinable;
   bool _detached;
-  Status _status;
+  PStatus _status;
 
   static pthread_key_t _pt_ptr_index;
   static bool _got_pt_ptr_index;