Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-08-18 14:08:54 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ccc4c05da96bca147eb30693a57da848e2943ca0
ccc4c05d
1 parent
01be68fe
fix #229, support vs2010 for srslibrtmp.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
24 行增加
和
2 行删除
trunk/src/kernel/srs_kernel_file.cpp
trunk/src/kernel/srs_kernel_utility.cpp
trunk/src/libs/srs_librtmp.hpp
trunk/src/kernel/srs_kernel_file.cpp
查看文件 @
ccc4c05
...
...
@@ -26,11 +26,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
#include <sys/uio.h>
#endif
#include <fcntl.h>
#include <sstream>
#include <sys/uio.h>
using
namespace
std
;
#include <srs_kernel_log.hpp>
...
...
trunk/src/kernel/srs_kernel_utility.cpp
查看文件 @
ccc4c05
...
...
@@ -307,8 +307,13 @@ int srs_do_create_dir_recursively(string dir)
}
// create curren dir.
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifndef _WIN32
mode_t
mode
=
S_IRUSR
|
S_IWUSR
|
S_IXUSR
|
S_IRGRP
|
S_IWGRP
|
S_IXGRP
|
S_IROTH
|
S_IXOTH
;
if
(
::
mkdir
(
dir
.
c_str
(),
mode
)
<
0
)
{
#else
if
(
::
mkdir
(
dir
.
c_str
())
<
0
)
{
#endif
if
(
errno
==
EEXIST
)
{
return
ERROR_SYSTEM_DIR_EXISTS
;
}
...
...
trunk/src/libs/srs_librtmp.hpp
查看文件 @
ccc4c05
...
...
@@ -49,6 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
typedef
unsigned
long
long
u_int64_t
;
typedef
long
long
int64_t
;
typedef
unsigned
int
u_int32_t
;
typedef
u_int32_t
uint32_t
;
typedef
int
int32_t
;
typedef
unsigned
char
u_int8_t
;
typedef
char
int8_t
;
...
...
@@ -1025,20 +1026,31 @@ typedef void* srs_hijack_io_t;
*************************************************************/
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifdef _WIN32
// for time.
#define _CRT_SECURE_NO_WARNINGS
#include <time.h>
int
gettimeofday
(
struct
timeval
*
tv
,
struct
timezone
*
tz
);
#define PRId64 "lld"
// for inet helpers.
typedef
int
socklen_t
;
const
char
*
inet_ntop
(
int
af
,
const
void
*
src
,
char
*
dst
,
socklen_t
size
);
// for mkdir().
#include<direct.h>
// for open().
typedef
int
mode_t
;
#define S_IRUSR 0
#define S_IWUSR 0
#define S_IXUSR 0
#define S_IRGRP 0
#define S_IWGRP 0
#define S_IXGRP 0
#define S_IROTH 0
#define S_IXOTH 0
// for file seek.
#include <io.h>
#include <fcntl.h>
#define open _open
...
...
@@ -1047,14 +1059,19 @@ typedef void* srs_hijack_io_t;
#define write _write
#define read _read
// for pid.
typedef
int
pid_t
;
pid_t
getpid
(
void
);
#define snprintf _snprintf
// for socket.
ssize_t
writev
(
int
fd
,
const
struct
iovec
*
iov
,
int
iovcnt
);
typedef
int64_t
useconds_t
;
int
usleep
(
useconds_t
usec
);
int
socket_setup
();
int
socket_cleanup
();
// others.
#define snprintf _snprintf
#endif
#ifdef __cplusplus
...
...
请
注册
或
登录
后发表评论