Merge branch 'unstable' of github.com:/antirez/redis into unstable

This commit is contained in:
antirez 2016-10-02 16:50:37 +02:00
commit 4674efdee2

View File

@ -33,6 +33,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <signal.h> #include <signal.h>
#include <dlfcn.h>
#ifdef HAVE_BACKTRACE #ifdef HAVE_BACKTRACE
#include <execinfo.h> #include <execinfo.h>
@ -40,7 +41,6 @@
#include <fcntl.h> #include <fcntl.h>
#include "bio.h" #include "bio.h"
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h>
#endif /* HAVE_BACKTRACE */ #endif /* HAVE_BACKTRACE */
#ifdef __CYGWIN__ #ifdef __CYGWIN__