正在显示
1 个修改的文件
包含
6 行增加
和
5 行删除
| @@ -102,7 +102,8 @@ int main(int argc, char** argv) | @@ -102,7 +102,8 @@ int main(int argc, char** argv) | ||
| 102 | srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); | 102 | srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); |
| 103 | srs_trace("uname: "SRS_AUTO_UNAME); | 103 | srs_trace("uname: "SRS_AUTO_UNAME); |
| 104 | srs_trace("build: %s, %s", SRS_AUTO_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian"); | 104 | srs_trace("build: %s, %s", SRS_AUTO_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian"); |
| 105 | - srs_trace("configure: "SRS_AUTO_CONFIGURE); | 105 | + srs_trace("configure: "SRS_AUTO_USER_CONFIGURE); |
| 106 | + srs_trace("features: "SRS_AUTO_CONFIGURE); | ||
| 106 | #ifdef SRS_AUTO_ARM_UBUNTU12 | 107 | #ifdef SRS_AUTO_ARM_UBUNTU12 |
| 107 | srs_trace("arm tool chain: "SRS_AUTO_ARM_TOOL_CHAIN); | 108 | srs_trace("arm tool chain: "SRS_AUTO_ARM_TOOL_CHAIN); |
| 108 | #endif | 109 | #endif |
| @@ -125,7 +126,7 @@ int run() | @@ -125,7 +126,7 @@ int run() | ||
| 125 | 126 | ||
| 126 | int pid = fork(); | 127 | int pid = fork(); |
| 127 | 128 | ||
| 128 | - if(pid == -1) { | 129 | + if(pid < 0) { |
| 129 | srs_error("create process error. ret=-1"); //ret=0 | 130 | srs_error("create process error. ret=-1"); //ret=0 |
| 130 | return -1; | 131 | return -1; |
| 131 | } | 132 | } |
| @@ -144,13 +145,13 @@ int run() | @@ -144,13 +145,13 @@ int run() | ||
| 144 | // father | 145 | // father |
| 145 | pid = fork(); | 146 | pid = fork(); |
| 146 | 147 | ||
| 147 | - if(pid == -1) { | ||
| 148 | - srs_error("create process error. ret=-1"); | 148 | + if(pid < 0) { |
| 149 | + srs_error("create process error. ret=0"); | ||
| 149 | return -1; | 150 | return -1; |
| 150 | } | 151 | } |
| 151 | 152 | ||
| 152 | if(pid > 0) { | 153 | if(pid > 0) { |
| 153 | - srs_trace("father process exit. ret=-1"); | 154 | + srs_trace("father process exit. ret=0"); |
| 154 | exit(0); | 155 | exit(0); |
| 155 | return 0; | 156 | return 0; |
| 156 | } | 157 | } |
-
请 注册 或 登录 后发表评论