X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=72fc0a888aaacd12b26fc8e72362f600fab87f2a;hb=21a7fea425de8b32ac71bbbb981e88e77e6a3428;hp=418962ab3ae98bd05d42f84b14bb5216138c4429;hpb=9fc822fe67ef4f5a898d9a85fbae7dd9a3435023;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 418962a..72fc0a8 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.10  1998-07-20 12:35:57  adam
+ * Revision 1.12  1998-10-13 16:00:18  adam
+ * Implemented nmem_critical_{enter,leave}.
+ *
+ * Revision 1.11  1998/08/21 14:13:36  adam
+ * Added GNU Configure script to build Makefiles.
+ *
+ * Revision 1.10  1998/07/20 12:35:57  adam
  * Added more memory diagnostics (when NMEM_DEBUG is 1).
  *
  * Revision 1.9  1998/07/07 15:49:01  adam
@@ -52,7 +58,13 @@
 #ifdef WINDOWS
 #include <windows.h>
 #elif _REENTRANT
+
+#if HAVE_PTHREAD_H
 #include <pthread.h>
+#elif HAVE_THREAD_H
+#include <thread.h>
+#endif
+
 #endif
 
 #define NMEM_CHUNK (4*1024)
@@ -62,7 +74,7 @@ static CRITICAL_SECTION critical_section;
 #define NMEM_ENTER EnterCriticalSection(&critical_section)
 #define NMEM_LEAVE LeaveCriticalSection(&critical_section)
 #elif _REENTRANT
-static pthread_mutex_t nmem_mutex;
+static pthread_mutex_t nmem_mutex = PTHREAD_MUTEX_INITIALIZER;
 #define NMEM_ENTER pthread_mutex_lock(&nmem_mutex);
 #define NMEM_LEAVE pthread_mutex_unlock(&nmem_mutex);
 #else
@@ -225,6 +237,16 @@ void nmem_destroy(NMEM n)
 #endif
 }
 
+void nmem_critical_enter (void)
+{
+    NMEM_ENTER;
+}
+
+void nmem_critical_leave (void)
+{
+    NMEM_LEAVE;
+}
+
 void nmem_init (void)
 {
 #ifdef WINDOWS