Merge pull request #51 from marshall/macPthreadQueue

move pthread_queue.h to include, fixing build bustage on Mac OS X
libcsp · Jul 1, 2015 · edadd3d · edadd3d
2 parents 589f050 + 19be5b0
commit edadd3d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 74 deletions.
diff --git a/include/csp/arch/csp_semaphore.h b/include/csp/arch/csp_semaphore.h
@@ -48,7 +48,8 @@ typedef pthread_mutex_t csp_mutex_t;
 /* MAC OS X interface */
 #if defined(CSP_MACOSX)
 
-#include "macosx/pthread_queue.h"
+#include <pthread.h>
+#include "posix/pthread_queue.h"
 
 #define CSP_SEMAPHORE_OK 	PTHREAD_QUEUE_OK
 #define CSP_SEMAPHORE_ERROR 	PTHREAD_QUEUE_EMPTY
@@ -58,7 +59,7 @@ typedef pthread_mutex_t csp_mutex_t;
 typedef pthread_queue_t * csp_bin_sem_handle_t;
 typedef pthread_queue_t * csp_mutex_t;
 
-#endif // CSP_POSIX
+#endif // CSP_MACOSX
 
 #if defined(CSP_WINDOWS)
 

diff --git a/src/arch/posix/pthread_queue.h → include/csp/arch/posix/pthread_queue.h b/src/arch/posix/pthread_queue.h → include/csp/arch/posix/pthread_queue.h
diff --git a/src/arch/macosx/csp_queue.c b/src/arch/macosx/csp_queue.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 /* CSP includes */
 #include <csp/csp.h>
 
-#include "pthread_queue.h"
+#include <csp/arch/posix/pthread_queue.h>
 #include <csp/arch/csp_queue.h>
 
 

diff --git a/src/arch/macosx/pthread_queue.c b/src/arch/macosx/pthread_queue.c
@@ -32,7 +32,7 @@ Inspired by c-pthread-queue by Matthew Dickinson
 #include <mach/mach.h>
 
 /* CSP includes */
-#include "pthread_queue.h"
+#include <csp/arch/posix/pthread_queue.h>
 
 pthread_queue_t * pthread_queue_create(int length, size_t item_size) {
 

diff --git a/src/arch/macosx/pthread_queue.h b/src/arch/macosx/pthread_queue.h
diff --git a/src/arch/posix/csp_queue.c b/src/arch/posix/csp_queue.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 /* CSP includes */
 #include <csp/csp.h>
 
-#include "pthread_queue.h"
+#include <csp/arch/posix/pthread_queue.h>
 #include <csp/arch/csp_queue.h>
 
 

diff --git a/src/arch/posix/pthread_queue.c b/src/arch/posix/pthread_queue.c
@@ -32,7 +32,7 @@ Inspired by c-pthread-queue by Matthew Dickinson
 #include <sys/time.h>
 
 /* CSP includes */
-#include "pthread_queue.h"
+#include <csp/arch/posix/pthread_queue.h>
 
 pthread_queue_t * pthread_queue_create(int length, size_t item_size) {