Merge branch 'master' of github.com:janvidar/uhub

Conflicts:
	CMakeLists.txt
This commit is contained in:
Jan Vidar Krey
2012-10-17 19:59:02 +02:00
4 changed files with 58 additions and 79 deletions

View File

@@ -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