revert to working upstream version, fix osx build

[nbds] / runtime / rlocal.h

diff --git a/runtime/rlocal.h b/runtime/rlocal.h
index fef861f423a408633e1daf804d739d45525d9110..bb62c76e260b98cf3b43b7a9834cfe69b12a653a 100644 (file)
--- a/runtime/rlocal.h
+++ b/runtime/rlocal.h
@@ -4,15 +4,9 @@
 #include "runtime.h"
 #include "tls.h"
 
-extern DECLARE_THREAD_LOCAL(ThreadId, int);
-
-#define GET_THREAD_INDEX() ({ LOCALIZE_THREAD_LOCAL(ThreadId, int); assert(ThreadId != 0); ThreadId - 1; })
-
 void mem_init (void);
-void rnd_init (void);
 
-void rnd_thread_init (void);
-void rcu_thread_init (void);
-void lwt_thread_init (void);
+void rcu_thread_init (int thread_id);
+void lwt_thread_init (int thread_id);
 
 #endif//RLOCAL_H