fix circular header inclusion

Author: ardera

src/util/asserts.h

@@ -10,9 +10,6 @@
 
 #include <assert.h>
 
-#include "lock_ops.h"
-#include "macros.h"
-
 #define ASSERT assert
 #define ASSERT_MSG(__cond, __msg) assert((__cond) && (__msg))
 #define ASSERT_NOT_NULL(__var) assert(__var != NULL)
@@ -22,20 +19,6 @@
 #define ASSERT_EGL_TRUE(__var) assert((__var) == EGL_TRUE)
 #define ASSERT_EGL_TRUE_MSG(__var, __msg) ASSERT_MSG((__var) == EGL_TRUE, __msg)
 
-#ifdef DEBUG
-static inline void assert_mutex_locked(pthread_mutex_t *mutex) {
-    int result = pthread_mutex_trylock(mutex);
-    if (result == 0) {
-        pthread_mutex_unlock(mutex);
-        ASSERT_MSG(false, "Mutex is not locked.");
-    }
-}
-#else
-static inline void assert_mutex_locked(mutex_t *mutex) {
-    (void) mutex;
-}
-#endif
-
 #define ASSERT_ZERO(__var) assert((__var) == 0)
 #define ASSERT_ZERO_MSG(__var, __msg) ASSERT_MSG((__var) == 0, __msg)
 

src/util/lock_ops.h

@@ -59,4 +59,18 @@
         (void) ok;                                                      \
     }
 
+#ifdef DEBUG
+static inline void assert_mutex_locked(pthread_mutex_t *mutex) {
+    int result = pthread_mutex_trylock(mutex);
+    if (result == 0) {
+        pthread_mutex_unlock(mutex);
+        ASSERT_MSG(false, "Mutex is not locked.");
+    }
+}
+#else
+static inline void assert_mutex_locked(mutex_t *mutex) {
+    (void) mutex;
+}
+#endif
+
 #endif  // _FLUTTERPI_SRC_UTIL_LOCK_OPS_H