diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
| commit | 729ffbae086309992d7433a296fca64f6800f8fa (patch) | |
| tree | 6c133d2b91ab9313da11bf8bad15f497e1b5c61f /source3/include/includes.h | |
| parent | 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff) | |
| parent | fc7050e54c69919d754ca0adf3f2f741a501fec4 (diff) | |
| download | samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.xz samba-729ffbae086309992d7433a296fca64f6800f8fa.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 9c5ea08f6d5..ccdc6d3fd3c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -25,7 +25,7 @@ #undef SIZEOF_LONG #endif -#include "lib/replace/replace.h" +#include "../replace/replace.h" /* make sure we have included the correct config.h */ #ifndef NO_CONFIG_H /* for some tests */ @@ -652,7 +652,7 @@ typedef char fstring[FSTRING_LEN]; #include "tdb.h" #include "util_tdb.h" -#include "lib/talloc/talloc.h" +#include "../talloc/talloc.h" /* And a little extension. Abort on type mismatch */ #define talloc_get_type_abort(ptr, type) \ (type *)talloc_check_name_abort(ptr, #type) |