Merge branch 'master' of github.com:janvidar/uhub
Conflicts: CMakeLists.txt
This commit is contained in:
@@ -129,7 +129,7 @@
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#if defined(BSD_LIKE) || defined(__sun__)
|
||||
#if ( defined(BSD_LIKE) && !defined(__FreeBSD_kernel__) ) || defined(__sun__)
|
||||
#undef HAVE_STRNDUP
|
||||
#undef HAVE_MEMMEM
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user