external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Support build srs-librtmp by VS2015. 2.0.267

Browse source
This commit is contained in:
winlin 2019-12-23 18:12:45 +08:00
parent 08bbbc5414
commit 01a4503ceb
7 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/libs/srs_lib_simple_socket.cpp
View file

@ -135,8 +135,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx;
int ret = ERROR_SUCCESS;
ssize_t nb_read = ::recv(skt->fd, (char*)buf, size, 0);
#ifdef _WIN32
ssize_t nb_read = (int)::recv(skt->fd, (char*)buf, (int)size, 0);
#else
ssize_t nb_read = (int)::recv(skt->fd, (char*)buf, size, 0);
#endif
if (nread) {
*nread = nb_read;
@ -242,7 +246,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
int ret = ERROR_SUCCESS;
ssize_t nb_write = ::writev(skt->fd, iov, iov_size);
ssize_t nb_write = ::writev((int)skt->fd, iov, iov_size);
if (nwrite) {
*nwrite = nb_write;
@ -301,8 +305,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx;
int ret = ERROR_SUCCESS;
ssize_t nb_write = ::send(skt->fd, (char*)buf, size, 0);
#ifdef _WIN32
ssize_t nb_write = (int)::send(skt->fd, (char*)buf, (int)size, 0);
#else
ssize_t nb_write = (int)::send(skt->fd, (char*)buf, size, 0);
#endif
if (nwrite) {
*nwrite = nb_write;

10
trunk/src/libs/srs_librtmp.cpp
View file

@ -202,8 +202,12 @@ struct Context
ssize_t nwrite = 0;
for (int i = 0; i < iovcnt; i++) {
const struct iovec* current = iov + i;
int nsent = ::send(fd, (char*)current->iov_base, current->iov_len, 0);
#ifdef _WIN32
int nsent = (int)::send(fd, (char*)current->iov_base, (int)current->iov_len, 0);
#else
int nsent = (int)::send(fd, (char*)current->iov_base, (size_t)current->iov_len, 0);
#endif
if (nsent < 0) {
return nsent;
}
@ -443,7 +447,7 @@ struct Context
if (i == 6 && best.base == 0 && (best.len == 6 ||
(best.len == 7 && words[7] != 0x0001) ||
(best.len == 5 && words[5] == 0xffff))) {
if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
if (!inet_ntop4(src+12, tp, (socklen_t)(sizeof tmp - (tp - tmp))))
return (NULL);
tp += strlen(tp);
break;

4
trunk/src/libs/srs_librtmp.hpp
View file

@ -1085,9 +1085,7 @@ typedef void* srs_hijack_io_t;
#define open _open
#define close _close
#define lseek _lseek
#define write _write
#define read _read
// for pid.
typedef int pid_t;
pid_t getpid(void);