[myserver-commit] [3062] Solve compiling problems under WIN32 with sockets classes.

[Giuseppe Scrivano]

Revision: 3062
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3062
Author:   gscrivano
Date:     2009-04-30 22:52:51 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Solve compiling problems under WIN32 with sockets classes.

Modified Paths:
--------------
    trunk/myserver/include/base/unix_socket/unix_socket.h
    trunk/myserver/src/base/socket_pair/socket_pair.cpp

Modified: trunk/myserver/include/base/unix_socket/unix_socket.h
===================================================================
--- trunk/myserver/include/base/unix_socket/unix_socket.h       2009-04-28 
10:07:55 UTC (rev 3061)
+++ trunk/myserver/include/base/unix_socket/unix_socket.h       2009-04-30 
22:52:51 UTC (rev 3062)
@@ -25,7 +25,9 @@
 
 extern "C"
 {
-#ifndef WIN32
+#ifdef WIN32
+#undef AF_UNIX //This shouldn't happen, but better be sure.
+#else
 #include <sys/un.h>
 #endif
 }

Modified: trunk/myserver/src/base/socket_pair/socket_pair.cpp
===================================================================
--- trunk/myserver/src/base/socket_pair/socket_pair.cpp 2009-04-28 10:07:55 UTC 
(rev 3061)
+++ trunk/myserver/src/base/socket_pair/socket_pair.cpp 2009-04-30 22:52:51 UTC 
(rev 3062)
@@ -227,7 +227,7 @@
  */
 int SocketPair::readHandle (FileHandle* fd)
 {
-  return readFileHandle (handles[0], fd);
+  return readFileHandle ((FileHandle)handles[0], fd);
 }
 
 /*!
@@ -237,5 +237,5 @@
  */
 int SocketPair::writeHandle (FileHandle fd)
 {
-  return writeFileHandle (handles[0], fd);
+  return writeFileHandle ((FileHandle)handles[0], fd);
 }