From: Brian Norris <banorris@uci.edu>
Date: Tue, 1 May 2012 20:25:47 +0000 (-0700)
Subject: threads: move thread_id_t definition and redefine thrd_t type
X-Git-Tag: pldi2013~474
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cca49f0c63efac9a730d9f26b9b90fabdd881337;p=model-checker.git

threads: move thread_id_t definition and redefine thrd_t type
---

diff --git a/action.h b/action.h
index 3eafaa9..1bac4a4 100644
--- a/action.h
+++ b/action.h
@@ -3,7 +3,7 @@
 
 #include <list>
 
-#include "libthreads.h"
+#include "threads.h"
 #include "libatomic.h"
 
 #define VALUE_NONE -1
diff --git a/libthreads.h b/libthreads.h
index 4cf6ad3..a899881 100644
--- a/libthreads.h
+++ b/libthreads.h
@@ -5,10 +5,9 @@
 extern "C" {
 #endif
 
-	typedef int thread_id_t;
 	typedef void (*thrd_start_t)();
 
-	typedef thread_id_t thrd_t;
+	typedef int thrd_t;
 
 	int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg);
 	int thrd_join(thrd_t);
diff --git a/threads.h b/threads.h
index 7a21a30..38eac0a 100644
--- a/threads.h
+++ b/threads.h
@@ -5,6 +5,8 @@
 
 #include "libthreads.h"
 
+typedef int thread_id_t;
+
 #define THREAD_ID_T_NONE	-1
 
 typedef enum thread_state {