Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
antirez
2012-07-28 20:55:17 +02:00
4 changed files with 21 additions and 3 deletions

View File

@ -36,6 +36,7 @@
#include <ctype.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/wait.h>
extern char **environ;