Mercurial > archived > louis > epitech > zia-api
changeset 63:112b00938a3d
imported patch fix_ssize_t.patch
| author | Louis Opter <opter_l@epitech.eu> |
|---|---|
| date | Tue, 30 Mar 2010 20:21:34 +0200 |
| parents | 4d7e65058f93 |
| children | 17fad87d0ed1 |
| files | include/handler/INetworkHandler.hpp tests/CMakeLists.txt tests/INetworkHandler.cpp |
| diffstat | 3 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/include/handler/INetworkHandler.hpp Tue Mar 30 20:21:34 2010 +0200 +++ b/include/handler/INetworkHandler.hpp Tue Mar 30 20:21:34 2010 +0200 @@ -3,8 +3,15 @@ # include <ios> +# include "IHandler.hpp" # include "network/IEndPoint.hpp" +# if _WIN32 +# include <BaseTsd.h> + +typedef SSIZE_T ssize_t; +# endif + namespace zia { namespace api @@ -43,7 +50,7 @@ * * @see network::IEndPoint */ - network::IEndPoint* (*sock_accept) (network::IEndPoint& server); + zia::api::network::IEndPoint* (*sock_accept) (zia::api::network::IEndPoint& server); /** * @brief Read redefinition, called when we want to read @@ -57,7 +64,7 @@ * * @see network::IEndPoint */ - ssize_t (*sock_read)(network::IEndPoint& client, void* buffer, size_t len); + ssize_t (*sock_read)(zia::api::network::IEndPoint& client, void* buffer, size_t len); /** * @brief Write redefinition, called when we want to write @@ -71,7 +78,7 @@ * * @see network::IEndPoint */ - ssize_t (*sock_write)(network::IEndPoint& client, const void* buffer, size_t len); + ssize_t (*sock_write)(zia::api::network::IEndPoint& client, const void* buffer, size_t len); /** * @brief Close redefinition, called when we want to close the socket. @@ -80,7 +87,7 @@ * * @return 0 on success, -1 on failure. */ - int (*sock_close)(network::IEndPoint& client); + int (*sock_close)(zia::api::network::IEndPoint& client); }; virtual ~INetworkHandler(void) { }
--- a/tests/CMakeLists.txt Tue Mar 30 20:21:34 2010 +0200 +++ b/tests/CMakeLists.txt Tue Mar 30 20:21:34 2010 +0200 @@ -6,6 +6,7 @@ SET(STREAMIT_TESTS IHeader + INetworkHandler ) FOREACH(I ${STREAMIT_TESTS})
--- a/tests/INetworkHandler.cpp Tue Mar 30 20:21:34 2010 +0200 +++ b/tests/INetworkHandler.cpp Tue Mar 30 20:21:34 2010 +0200 @@ -24,7 +24,7 @@ int main(void) { - zia::api::handler::INetworkHandler::sPtrFunc hdlrs = + zia::api::handler::INetworkHandler::sPtrFunc hldrs = { &test_accept_func, &test_read_func, @@ -32,5 +32,7 @@ &test_close_func }; + /* use hldrs to avoid a warning */ + hldrs.sock_close = NULL; return (0); }