[waffle] [PATCH 3/3] third_party/threads: remove the _MTX_INITIALIZER_NP hack

Emil Velikov emil.l.velikov at gmail.com
Thu Mar 19 15:26:13 PDT 2015


No longer used as of last commit.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/waffle/core/wcore_display.c | 1 -
 src/waffle/core/wcore_display.h | 1 +
 third_party/threads/threads.h   | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/waffle/core/wcore_display.c b/src/waffle/core/wcore_display.c
index 49aeae6..b2dfb67 100644
--- a/src/waffle/core/wcore_display.c
+++ b/src/waffle/core/wcore_display.c
@@ -25,7 +25,6 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include "threads.h"
 
 #include "wcore_display.h"
 
diff --git a/src/waffle/core/wcore_display.h b/src/waffle/core/wcore_display.h
index c4348c4..74d0570 100644
--- a/src/waffle/core/wcore_display.h
+++ b/src/waffle/core/wcore_display.h
@@ -27,6 +27,7 @@
 
 #include <assert.h>
 #include "c99_compat.h"
+#include "threads.h"
 
 #include "api_object.h"
 
diff --git a/third_party/threads/threads.h b/third_party/threads/threads.h
index 4e7dba2..5d73102 100644
--- a/third_party/threads/threads.h
+++ b/third_party/threads/threads.h
@@ -56,9 +56,6 @@
 #endif
 #define TSS_DTOR_ITERATIONS 1
 
-// FIXME: temporary non-standard hack to ease transition
-#define _MTX_INITIALIZER_NP {{(PCRITICAL_SECTION_DEBUG)-1, -1, 0, 0, 0, 0}}
-
 /*---------------------------- types ----------------------------*/
 typedef struct cnd_t {
 #ifdef EMULATED_THREADS_USE_NATIVE_CV
@@ -100,9 +97,6 @@ typedef struct once_flag_t {
 #define TSS_DTOR_ITERATIONS 1  // assume TSS dtor MAY be called at least once.
 #endif
 
-// FIXME: temporary non-standard hack to ease transition
-#define _MTX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
-
 /*---------------------------- types ----------------------------*/
 typedef pthread_cond_t  cnd_t;
 typedef pthread_t       thrd_t;
-- 
2.3.1



More information about the waffle mailing list