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

Merge pull request #135 from T-bagwell/master

Browse source 
Support porting srs on MacOS OSX system Platform
This commit is contained in:
winlin 2014-07-27 21:07:37 +08:00
commit b198d17ab9
4 changed files with 151 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_json.cpp
View file

@ -526,7 +526,6 @@ extern "C" {
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <malloc.h>
#include <assert.h>
//#include "nxjson.h"

2
trunk/src/app/srs_app_server.cpp
View file

@ -476,7 +476,7 @@ int SrsServer::acquire_pid_file()
}
// require write lock
flock lock;
struct flock lock;
lock.l_type = F_WRLCK; // F_RDLCK, F_WRLCK, F_UNLCK
lock.l_start = 0; // type offset, relative to l_whence