X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmsg-thread.cpp;h=af65ece3a5ee073263d5636f03b6396e32067e7f;hb=850cba55769a7ed94d4da0e7c05b823e54ce3cc3;hp=3315e2649c25f8b428703a8b260ad6eb5ac7ba4e;hpb=7f81d5b3aa6b9d7e4c5c1e02c91dd416eb97d19e;p=yazproxy-moved-to-github.git

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 3315e26..af65ece 100644
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.cpp,v 1.1 2005-05-30 20:08:58 adam Exp $
+/* $Id: msg-thread.cpp,v 1.4 2005-06-10 22:54:22 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -21,12 +21,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <pthread.h>
 #include <unistd.h>
 #include <ctype.h>
+#include <stdio.h>
 
 #include <yaz++/socket-observer.h>
 #include <yaz/log.h>
 
 #include "msg-thread.h"
 
+using namespace yazpp_1;
+
 Msg_Thread_Queue::Msg_Thread_Queue()
 {
     m_list = 0;
@@ -70,12 +73,12 @@ static void *tfunc(void *p)
 }
 
 
-Msg_Thread::Msg_Thread(IYazSocketObservable *obs)
+Msg_Thread::Msg_Thread(ISocketObservable *obs)
     : m_SocketObservable(obs)
 {
     pipe(m_fd);
     obs->addObserver(m_fd[0], this);
-    obs->maskObserver(this, YAZ_SOCKET_OBSERVE_READ);
+    obs->maskObserver(this, SOCKET_OBSERVE_READ);
 
     m_stop_flag = false;
     pthread_mutex_init(&m_mutex_input_data, 0);
@@ -106,7 +109,7 @@ Msg_Thread::~Msg_Thread()
 
 void Msg_Thread::socketNotify(int event)
 {
-    if (event & YAZ_SOCKET_OBSERVE_READ)
+    if (event & SOCKET_OBSERVE_READ)
     {
 	char buf[2];
 	read(m_fd[0], buf, 1);