Mercurial > hg > orthanc
changeset 32:0c3e317f35e8
fix for linux32
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 30 Aug 2012 09:35:38 +0200 |
parents | 46e20d4455d1 |
children | de56f3951fad 96e57b863dd9 |
files | Resources/CMake/LibCurlConfiguration.cmake |
diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/LibCurlConfiguration.cmake Wed Aug 29 17:15:17 2012 +0200 +++ b/Resources/CMake/LibCurlConfiguration.cmake Thu Aug 30 09:35:38 2012 +0200 @@ -47,6 +47,7 @@ set_property( SOURCE ${CURL_SOURCES} PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;OS=\"${TMP_OS}\"") + if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") add_definitions( -DRECV_TYPE_ARG1=int @@ -66,15 +67,15 @@ ) elseif ("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") add_definitions( - -DRECV_TYPE_ARG1=SOCKET - -DRECV_TYPE_ARG2=char* - -DRECV_TYPE_ARG3=int + -DRECV_TYPE_ARG1=int + -DRECV_TYPE_ARG2=void* + -DRECV_TYPE_ARG3=size_t -DRECV_TYPE_ARG4=int -DRECV_TYPE_RETV=int - -DSEND_TYPE_ARG1=SOCKET - -DSEND_TYPE_ARG2=char* + -DSEND_TYPE_ARG1=int + -DSEND_TYPE_ARG2=void* -DSEND_QUAL_ARG2=const - -DSEND_TYPE_ARG3=int + -DSEND_TYPE_ARG3=size_t -DSEND_TYPE_ARG4=int -DSEND_TYPE_RETV=int -DSIZEOF_SHORT=2