X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fmsg-thread.cpp;h=d7e4eb28044d4cb052b156d885bd2c3a0a75ae11;hp=e87231cd8a281f0a61d88881a8a34fa42bdc00ed;hb=4f79f9b5b0095b2f81b1ce583f0f82462f9ee36a;hpb=ce193eb0444478dc61e832497ab7f4a7ae73c0c6

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index e87231c..d7e4eb2 100644
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,7 +1,5 @@
-/* $Id: msg-thread.cpp,v 1.13 2006-03-30 13:29:23 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,16 +12,18 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
 #endif
 
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 
@@ -34,7 +34,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 using namespace yazpp_1;
 
-struct Msg_Thread::Private {
+class Msg_Thread::Private {
 public:
     int m_no_threads;
     Msg_Thread_Queue m_input;
@@ -130,7 +130,7 @@ Msg_Thread::~Msg_Thread()
     m_p->m_stop_flag = true;
     pthread_cond_broadcast(&m_p->m_cond_input_data);
     pthread_mutex_unlock(&m_p->m_mutex_input_data);
-    
+
     int i;
     for (i = 0; i<m_p->m_no_threads; i++)
         pthread_join(m_p->m_thread_id[i], 0);
@@ -150,7 +150,7 @@ Msg_Thread::~Msg_Thread()
 
 void Msg_Thread::socketNotify(int event)
 {
-#if HAVE_POSIX_THREADS
+#if YAZ_POSIX_THREADS
     if (event & SOCKET_OBSERVE_READ)
     {
         char buf[2];
@@ -183,7 +183,7 @@ void Msg_Thread::run(void *p)
         IMsg_Thread *out = in->handle();
         pthread_mutex_lock(&m_p->m_mutex_output_data);
         m_p->m_output.enqueue(out);
-        
+
         write(m_p->m_fd[1], "", 1);
         pthread_mutex_unlock(&m_p->m_mutex_output_data);
     }
@@ -206,6 +206,7 @@ void Msg_Thread::put(IMsg_Thread *m)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab