--- parser3/src/include/pa_threads.h	2001/05/17 10:22:24	1.14
+++ parser3/src/include/pa_threads.h	2020/12/11 14:59:19	1.35
@@ -1,29 +1,33 @@
 /** @file
 	Parser: mutex & helpers decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_threads.h,v 1.14 2001/05/17 10:22:24 parser Exp $
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_THREADS_H
 #define PA_THREADS_H
 
+#define IDENT_PA_THREADS_H "$Id: pa_threads.h,v 1.35 2020/12/11 14:59:19 moko Exp $"
+
 #include "pa_config_includes.h"
 #include "pa_types.h"
 
-
-#ifdef MULTITHREAD
+/// get caller thread ID
+uint pa_get_thread_id();
 
 class AutoSYNCHRONIZED;
 
 /// simple semaphore object
 class Mutex {
-	friend AutoSYNCHRONIZED;
-private:
-	uint handle;
+	friend class AutoSYNCHRONIZED;
+
+#ifdef WIN32
+HANDLE handle;
+#else
+pthread_mutex_t handle;
+#endif
+
 public:
 	Mutex();
 	~Mutex();
@@ -36,9 +40,9 @@ extern Mutex global_mutex;
 
 /** 
 	Helper to ensure paired Mutex::acquire() and Mutex::release().
-
 	Use it with SYNCHRONIZED macro
 */
+
 class AutoSYNCHRONIZED {
 public:
 	AutoSYNCHRONIZED() { global_mutex.acquire(); }
@@ -54,12 +58,8 @@ public:
 	@endverbatim
 
 	WARNING: don't use THROW or PTHROW with such thread safety mechanizm -
-	longjump would leave global_mutex acquired, which is wrong!
+	longjmp would leave global_mutex acquired, which is wrong!
 */
-#	define SYNCHRONIZED AutoSYNCHRONIZED autoSYNCHRONIZED()
-#else // not MULTITHREAD-ed
-#	define SYNCHRONIZED /* do nothing */
-#endif
-
+#define SYNCHRONIZED AutoSYNCHRONIZED autoSYNCHRONIZED
 
 #endif