diff -r --strip-trailing-cr Desktop/Open-Source/dti_0_1_1/include/dti/sockets/detail/sockdetail.h Desktop/dti_0_1_1_modified_for_Mac_OS_X/include/dti/sockets/detail/sockdetail.h 101c101 < int recv_format(void *buf, unsigned int len, int flags); --- > int recv_format(void *buf, std::size_t len, int flags); 104c104 < int send_format(const void *buf, unsigned int len, int flags); --- > int send_format(const void *buf, std::size_t len, int flags); 107c107 < int recv_noformat(void *buf, unsigned int len, int flags); --- > int recv_noformat(void *buf, std::size_t len, int flags); 110c110 < int send_noformat(const void *buf, unsigned int len, int flags); --- > int send_noformat(const void *buf, std::size_t len, int flags); diff -r --strip-trailing-cr Desktop/Open-Source/dti_0_1_1/src/sockets/sock.cpp Desktop/dti_0_1_1_modified_for_Mac_OS_X/src/sockets/sock.cpp 819c819 < int optlen = sizeof optval; --- > unsigned int optlen = sizeof optval; 886c886 < int namelen = sizeof si; --- > unsigned int namelen = sizeof si; 927c927 < int namelen = sizeof si; --- > unsigned int namelen = sizeof si; 935c935 < int namelen = sizeof si; --- > unsigned int namelen = sizeof si; diff -r --strip-trailing-cr Desktop/Open-Source/dti_0_1_1/src/stream/bz2stream.cpp Desktop/dti_0_1_1_modified_for_Mac_OS_X/src/stream/bz2stream.cpp 32c32 < #include "libbz2\bzlib.h" --- > #include "libbz2/bzlib.h" diff -r --strip-trailing-cr Desktop/Open-Source/dti_0_1_1/src/stream/bzstream.cpp Desktop/dti_0_1_1_modified_for_Mac_OS_X/src/stream/bzstream.cpp 30c30 < #include "libbz2\bzlib.h" --- > #include "libbz2/bzlib.h" diff -r --strip-trailing-cr Desktop/Open-Source/dti_0_1_1/src/stream/gzstream.cpp Desktop/dti_0_1_1_modified_for_Mac_OS_X/src/stream/gzstream.cpp 31c31 < #include "libZ\zlib.h" --- > #include "libZ/zlib.h" diff -r --strip-trailing-cr Desktop/Open-Source/dti_0_1_1/src/stream/zstream.cpp Desktop/dti_0_1_1_modified_for_Mac_OS_X/src/stream/zstream.cpp 37c37 < #include "libZ\zlib.h" --- > #include "libZ/zlib.h"