Removing pthreads completely - for now.

2 files changed, 2 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 1693680..1a64e86 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,8 @@ BALTISOT_SOURCES = \
 Main.cc \
 ldirlib.c \
 \
+LockSmith.cc \
+\
 RandISAAC.cc \
 Exceptions.cc \
 String.cc \
diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp
index d7fa715..2da6675 100644
--- a/src/lua-interface.cpp
+++ b/src/lua-interface.cpp
@@ -100,23 +100,6 @@ extern unsigned char lua_interface_light_lua[];
 #define LIGHT
 #endif
 
-class pthreadlocker_t : public locker_t {
-  public:
-      pthreadlocker_t() { init_mutex(); }
-      ~pthreadlocker_t() { pthread_mutex_destroy(&mutex); }
-    virtual void lock() { pthread_mutex_lock(&mutex); }
-    virtual void unlock() { pthread_mutex_unlock(&mutex); }
-  private:
-    void init_mutex() {
-        pthread_mutexattr_t attr;
-        pthread_mutexattr_init(&attr);
-        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-        pthread_mutex_init(&mutex, &attr);
-        pthread_mutexattr_destroy(&attr);
-    }
-    pthread_mutex_t mutex;
-};
-
 #ifdef _WIN32
 
 #include <windows.h>
@@ -836,8 +819,6 @@ virtual int startup() throw (GeneralException) {
     String hport = "1500", tport = "1550", mport = "2500";
     pthread_t interactive_thread;
     
-    locker = new pthreadlocker_t();
-    
     verbosity = M_WARNING;
 
     showbanner();