2009-10-21 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* sockets.[ch]: fix function definition.

svn path=/trunk/mono/; revision=144576

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 646f0424ea7755fd9a0abd4ff8a227dabdaf7a75..dde2fcdfa38bb1dfb1c3bca7e7eac495f1a239bf 100644 (file)
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-21 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * sockets.[ch]: fix function definition.
+
 2009-10-21 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * sockets.[ch]: added TransmitFile implementation.

diff --git a/mono/io-layer/sockets.c b/mono/io-layer/sockets.c
index 07b55f25deb85f8591204656896f4f433fcc8f97..16dcb16892f85e5b97427f34e3ca2abdbed4b01c 100644 (file)
--- a/mono/io-layer/sockets.c
+++ b/mono/io-layer/sockets.c
@@ -1123,7 +1123,7 @@ static gboolean wapi_disconnectex (guint32 fd, WapiOverlapped *overlapped,
 
 #define SF_BUFFER_SIZE 16384
 static gint
-wapi_sendfile (guint32 socket, gpointer fd, guint32 bytes_to_write, guint32 bytes_per_send, WapiTransmitFileFlags flags)
+wapi_sendfile (guint32 socket, gpointer fd, guint32 bytes_to_write, guint32 bytes_per_send, guint32 flags)
 {
 #if defined(HAVE_SENDFILE) && (defined(__linux__) || defined(DARWIN))
        gint file = GPOINTER_TO_INT (fd);
@@ -1190,7 +1190,7 @@ wapi_sendfile (guint32 socket, gpointer fd, guint32 bytes_to_write, guint32 byte
 
 gboolean
 TransmitFile (guint32 socket, gpointer file, guint32 bytes_to_write, guint32 bytes_per_send, WapiOverlapped *ol,
-               WapiTransmitFileBuffers *buffers, WapiTransmitFileFlags flags)
+               WapiTransmitFileBuffers *buffers, guint32 flags)
 {
        gpointer sock = GUINT_TO_POINTER (socket);
        gint ret;

diff --git a/mono/io-layer/sockets.h b/mono/io-layer/sockets.h
index db9ad8b58a18cea3224695f9df8f8eec2e3f4bd1..bae67c4fa57d233040464bfeb95711be09ab50a1 100644 (file)
--- a/mono/io-layer/sockets.h
+++ b/mono/io-layer/sockets.h
@@ -97,6 +97,6 @@ extern int WSASend (guint32 handle, WapiWSABuf *buffers, guint32 count,
                    WapiOverlapped *overlapped, WapiOverlappedCB *complete);
 
 gboolean TransmitFile (guint32 socket, gpointer file, guint32 bytes_to_write, guint32 bytes_per_send, WapiOverlapped *ol,
-                       WapiTransmitFileBuffers *tb, WapiTransmitFileFlags flags);
+                       WapiTransmitFileBuffers *tb, guint32 flags);
 G_END_DECLS
 #endif /* _WAPI_SOCKETS_H_ */