1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00

Merge branch 'srs.master'

This commit is contained in:
winlin 2014-11-05 17:13:18 +08:00
commit 7bfa86de5a
5 changed files with 215 additions and 217 deletions

2
trunk/research/st/public.h Normal file → Executable file
View file

@ -72,7 +72,6 @@
#ifdef __cplusplus
extern "C" {
#endif
typedef unsigned long long st_utime_t;
typedef struct _st_thread * st_thread_t;
typedef struct _st_cond * st_cond_t;
@ -175,7 +174,6 @@ extern st_netfd_t st_open(const char *path, int oflags, mode_t mode);
extern void _st_show_thread_stack(st_thread_t thread, const char *messg);
extern void _st_iterate_threads(void);
#endif
#ifdef __cplusplus
}
#endif