Introducing namespace yazpp_1 for all YAZ++ functions. This will

[yazpp-moved-to-github.git] / src / yaz-pdu-assoc-thread.cpp

diff --git a/src/yaz-pdu-assoc-thread.cpp b/src/yaz-pdu-assoc-thread.cpp
index e526dfc..54d2cf0 100644 (file)
--- a/src/yaz-pdu-assoc-thread.cpp
+++ b/src/yaz-pdu-assoc-thread.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-pdu-assoc-thread.cpp,v 1.7 2004-11-30 21:10:31 adam Exp $
+ * $Id: yaz-pdu-assoc-thread.cpp,v 1.10 2005-06-02 06:40:21 adam Exp $
  */
 
 #ifdef WIN32
@@ -15,20 +15,26 @@
 
 #if USE_THREADS
 
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef WIN32
 #include <process.h>
 #else
 #include <pthread.h>
-#include <unistd.h>
 #endif
 
+
 #include <errno.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/tcpip.h>
 
 #include <yaz++/pdu-assoc.h>
 #include <yaz++/socket-manager.h>
 
+using namespace yazpp_1;
+
 Yaz_PDU_AssocThread::Yaz_PDU_AssocThread(
     IYazSocketObservable *socketObservable)
     : Yaz_PDU_Assoc(socketObservable)