X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fspipe.c;h=2a3bf149a017622b0692de0dd5e005764286a2bc;hb=b756b711841bac38e5b69baa51939ca9e1c01adb;hp=f42c8f102444ba70a13f16d1810d48a1072a23ec;hpb=7dc39ebcca4138d27f9a0e5082b2829a7c96375a;p=yaz-moved-to-github.git diff --git a/src/spipe.c b/src/spipe.c index f42c8f1..2a3bf14 100644 --- a/src/spipe.c +++ b/src/spipe.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ @@ -49,10 +49,18 @@ #include #endif +#if HAVE_NETINET_IN_H #include +#endif +#if HAVE_NETDB_H #include +#endif +#if HAVE_ARPA_INET_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif struct yaz_spipe { int m_fd[2]; @@ -117,7 +125,7 @@ yaz_spipe_t yaz_spipe_create(int port_to_use, WRBUF *err_msg) #endif fd_set write_set; - // create server socket + /* create server socket */ p->m_socket = socket(AF_INET, SOCK_STREAM, 0); if (p->m_socket == YAZ_INVALID_SOCKET) { @@ -139,7 +147,7 @@ yaz_spipe_t yaz_spipe_create(int port_to_use, WRBUF *err_msg) } } #endif - // bind server socket + /* bind server socket */ add.sin_family = AF_INET; add.sin_port = htons(port_to_use); add.sin_addr.s_addr = INADDR_ANY; @@ -161,7 +169,7 @@ yaz_spipe_t yaz_spipe_create(int port_to_use, WRBUF *err_msg) return 0; } - // client socket + /* client socket */ tmpadd = (unsigned) inet_addr("127.0.0.1"); if (!tmpadd) { @@ -186,9 +194,9 @@ yaz_spipe_t yaz_spipe_create(int port_to_use, WRBUF *err_msg) { if ( #ifdef WIN32 - WSAGetLastError() != WSAEWOULDBLOCK + WSAGetLastError() != WSAEWOULDBLOCK #else - errno != EINPROGRESS + errno != EINPROGRESS #endif ) {