Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/testsangomaboost.c
This commit is contained in:
Moises Silva committed 2010-12-08 22:41:51 -05:00
commit 1ee94f343a
15 files changed
+367 -39

No files matched your search

+1 -2
View File
@@ -48,8 +48,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#ifdef __linux__
#ifndef __USE_BSD
#if defined(__linux__) && !defined(__USE_BSD)
#define __USE_BSD
#endif
#include <unistd.h>