Merge branch '2.0release' into develop

This commit is contained in:
winlin 2015-05-30 21:20:21 +08:00
commit c3c4cb2f2a

View File

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <ifaddrs.h>
#include <arpa/inet.h>
#include <signal.h>
#include <wait.h>
#include <sys/wait.h>
#ifdef SRS_OSX
#include <sys/sysctl.h>