Merge branch 'master' of gitlab.engr.illinois.edu:samarth5/queues

8fa4a05f · samarth5 · 33742e2f · 41750493 · 8fa4a05f · 8fa4a05f
Commit 8fa4a05f authored 7 years ago by samarth5
--- a/PCQueue.h
+++ b/PCQueue.h
@@ -20,8 +20,8 @@

 // CHANGE - Adding includes for successful build.
 #define CMK_SHARED_VARS_POSIX_THREADS_SMP 1
-#include "converse.h"
-#include "machine-common-core.c"
+#include "./converse-6.8/converse.h"
+#include "./converse-6.8/machine-common-core.c"

 /*****************************************************************************
 * #define CMK_PCQUEUE_LOCK

--- a/cmiqueue.h
+++ b/cmiqueue.h
--- a/conv-autoconfig.h
+++ b/conv-autoconfig.h
--- a/conv-common.h
+++ b/conv-common.h
--- a/conv-config.h
+++ b/conv-config.h
--- a/conv-cpath.h
+++ b/conv-cpath.h
--- a/conv-cpm.h
+++ b/conv-cpm.h
--- a/conv-lists.h
+++ b/conv-lists.h
--- a/conv-mach-opt.h
+++ b/conv-mach-opt.h
--- a/conv-mach.h
+++ b/conv-mach.h
--- a/conv-qd.h
+++ b/conv-qd.h
--- a/conv-random.h
+++ b/conv-random.h
--- a/conv-rdma.h
+++ b/conv-rdma.h
--- a/conv-trace.h
+++ b/conv-trace.h
--- a/converse.h
+++ b/converse.h
--- a/debug-conv.h
+++ b/debug-conv.h
--- a/lrtslock.h
+++ b/lrtslock.h
--- a/machine-common-core.c
+++ b/machine-common-core.c
--- a/persistent.h
+++ b/persistent.h
--- a/pup_c.h
+++ b/pup_c.h