summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-02-27 20:45:42 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-02-28 21:11:21 +0100
commit31d09b13d3dc3aa204cf416bdf87eb39b7fe5de2 (patch)
tree4d820ee2c94da215c5ab0e9f8ff110edfe52452d
parent136c1600648f690d7709a204c4a7117bb5a868c3 (diff)
downloadsamba-31d09b13d3dc3aa204cf416bdf87eb39b7fe5de2.tar.gz
samba-31d09b13d3dc3aa204cf416bdf87eb39b7fe5de2.tar.bz2
samba-31d09b13d3dc3aa204cf416bdf87eb39b7fe5de2.zip
tdb: Use <tdb.h> to include tdb so system headers are found when building against system tdb.
-rw-r--r--lib/crypto/md4test.c2
-rw-r--r--lib/tdr/tdr.c2
-rw-r--r--lib/util/util_runcmd.c2
-rw-r--r--lib/util/util_tdb.c2
-rw-r--r--source4/auth/credentials/pycredentials.h2
-rw-r--r--source4/auth/pyauth.h2
-rw-r--r--source4/lib/tdb_wrap.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index e406c692a1..7516e826ab 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -26,7 +26,7 @@ struct torture_context;
/*
This uses the test values from rfc1320
*/
-bool torture_local_crypto_md4(struct torture_context *torture)
+bool torture_local_crypto_md4(struct torture_context *torture)
{
bool ret = true;
uint32_t i;
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 95871047b7..ab016d0bc4 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -387,7 +387,7 @@ NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p)
return NT_STATUS_OK;
}
-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...)
{
va_list ap;
char *s = NULL;
diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index 50a3db7f72..d617254432 100644
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -28,7 +28,7 @@
#include "includes.h"
#include "system/filesys.h"
#include <tevent.h>
-#include <tevent_unix.h>
+#include "../lib/util/tevent_unix.h"
struct samba_runcmd_state {
int stdout_log_level;
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index 8973b9b1ec..4a81678808 100644
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
/* these are little tdb utility functions that are meant to make
diff --git a/source4/auth/credentials/pycredentials.h b/source4/auth/credentials/pycredentials.h
index 5c3a9b2ebb..451ade6ee9 100644
--- a/source4/auth/credentials/pycredentials.h
+++ b/source4/auth/credentials/pycredentials.h
@@ -20,7 +20,7 @@
#define _PYCREDENTIALS_H_
#include "auth/credentials/credentials.h"
-#include "lib/talloc/pytalloc.h"
+#include <pytalloc.h>
extern PyTypeObject PyCredentials;
extern PyTypeObject PyCredentialCacheContainer;
diff --git a/source4/auth/pyauth.h b/source4/auth/pyauth.h
index 2d0379e6e8..38fd2a56a8 100644
--- a/source4/auth/pyauth.h
+++ b/source4/auth/pyauth.h
@@ -20,7 +20,7 @@
#ifndef _PYAUTH_H_
#define _PYAUTH_H_
-#include "lib/talloc/pytalloc.h"
+#include <pytalloc.h>
#include "auth/session.h"
#define PyAuthSession_AsSession(obj) py_talloc_get_type(obj, struct auth_session_info)
diff --git a/source4/lib/tdb_wrap.c b/source4/lib/tdb_wrap.c
index e08e4f73fc..97294e13d3 100644
--- a/source4/lib/tdb_wrap.c
+++ b/source4/lib/tdb_wrap.c
@@ -23,7 +23,7 @@
#include <tdb.h>
#include "../lib/util/dlinklist.h"
#include "tdb_wrap.h"
-#include "tdb.h"
+#include <tdb.h>
static struct tdb_wrap *tdb_list;