summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-04-15 14:36:13 +1000
committerAndrew Bartlett <abartlet@samba.org>2009-04-15 14:36:13 +1000
commit4678d1c6f4de1af9144de37d6d4b35c6c39e254d (patch)
tree94e58cf112ef34412bc5521f4bc9f56424ee967f /source4/include
parent86b50a0e6eacc14e157602811f30f11dccc471a8 (diff)
parent92d321006d1748ac47cf9b52330212f4ae03f502 (diff)
downloadsamba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.tar.gz
samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.tar.bz2
samba-4678d1c6f4de1af9144de37d6d4b35c6c39e254d.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge-without-netlogond
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/includes.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index d9b7759e7e..4862a62e22 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -64,6 +64,10 @@
/* String routines */
#include "../lib/util/safe_string.h"
+/* Thread functions. */
+#include "../lib/util/smb_threads.h"
+#include "../lib/util/smb_threads_internal.h"
+
#if 0
/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
#define TALLOC_ABORT(reason) smb_panic(reason)