Merge branch 'srs.master'

10 years ago · 7bfa86de5a
parent 760c37ae82 bba2d3dd98
commit 7bfa86de5a
5 changed files with 215 additions and 217 deletions
--- a/trunk/research/st/public.h
+++ b/trunk/research/st/public.h
@ -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