From 616746ec12aae78b0d0262c009568109686cb000 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Tue, 9 Oct 2012 12:09:02 -0700
Subject: [PATCH] move libthreads.h -> include/threads.h

Helps user programs to be able to just use C11 <threads.h>
---
 libthreads.h => include/threads.h | 10 +++++-----
 libthreads.cc                     |  2 +-
 main.cc                           |  2 +-
 test/double-relseq.c              |  2 +-
 test/linuxrwlocks.c               |  2 +-
 test/pending-release.c            |  2 +-
 test/releaseseq.c                 |  2 +-
 test/rmwprog.c                    |  2 +-
 test/userprog.c                   |  2 +-
 threads-model.h                   |  2 +-
 threads.cc                        |  2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)
 rename libthreads.h => include/threads.h (67%)

diff --git a/libthreads.h b/include/threads.h
similarity index 67%
rename from libthreads.h
rename to include/threads.h
index 8033a12d..641b0cf0 100644
--- a/libthreads.h
+++ b/include/threads.h
@@ -1,9 +1,9 @@
-/** @file libthreads.h
- *  @brief Basic Thread Library Functionality.
+/** @file threads.h
+ *  @brief C11 Thread Library Functionality
  */
 
-#ifndef __LIBTHREADS_H__
-#define __LIBTHREADS_H__
+#ifndef __THREADS_H__
+#define __THREADS_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,4 +24,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __LIBTHREADS_H__ */
+#endif /* __THREADS_H__ */
diff --git a/libthreads.cc b/libthreads.cc
index 9e34141b..2b2bf85a 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,4 +1,4 @@
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
 #include "threads-model.h"
 
diff --git a/main.cc b/main.cc
index bff111f0..6624f068 100644
--- a/main.cc
+++ b/main.cc
@@ -4,7 +4,7 @@
 
 #include <unistd.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
 #include "threads-model.h"
 
diff --git a/test/double-relseq.c b/test/double-relseq.c
index 369265a7..53147b72 100644
--- a/test/double-relseq.c
+++ b/test/double-relseq.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "librace.h"
 #include "stdatomic.h"
 
diff --git a/test/linuxrwlocks.c b/test/linuxrwlocks.c
index a14ed020..ac2fe521 100644
--- a/test/linuxrwlocks.c
+++ b/test/linuxrwlocks.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "librace.h"
 #include "stdatomic.h"
 
diff --git a/test/pending-release.c b/test/pending-release.c
index 739c45e0..d74dcca6 100644
--- a/test/pending-release.c
+++ b/test/pending-release.c
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "librace.h"
 #include "stdatomic.h"
 
diff --git a/test/releaseseq.c b/test/releaseseq.c
index 27f2fb1c..cbb8ef56 100644
--- a/test/releaseseq.c
+++ b/test/releaseseq.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "librace.h"
 #include "stdatomic.h"
 
diff --git a/test/rmwprog.c b/test/rmwprog.c
index a74ae426..5911e5a3 100644
--- a/test/rmwprog.c
+++ b/test/rmwprog.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "librace.h"
 #include "stdatomic.h"
 
diff --git a/test/userprog.c b/test/userprog.c
index b45e8f9d..6ad49092 100644
--- a/test/userprog.c
+++ b/test/userprog.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "librace.h"
 #include "stdatomic.h"
 
diff --git a/threads-model.h b/threads-model.h
index 28d237d4..8b165d54 100644
--- a/threads-model.h
+++ b/threads-model.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "mymemory.h"
-#include "libthreads.h"
+#include <threads.h>
 #include "modeltypes.h"
 
 /** @brief Represents the state of a user Thread */
diff --git a/threads.cc b/threads.cc
index 2ff058f4..dc2db2d9 100644
--- a/threads.cc
+++ b/threads.cc
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
 #include "threads-model.h"
 
-- 
2.34.1