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 /source4/heimdal_build | |
| 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 'source4/heimdal_build')
| -rw-r--r-- | source4/heimdal_build/config.h | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/gssapi-glue.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 38cdfbb6a6a..e15c6effa82 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -7,7 +7,7 @@ #define HAVE_HEIMDAL_CONFIG_H #include "include/config.h" -#include "lib/replace/replace.h" +#include "../replace/replace.h" #define RCSID(msg) struct __rcsid { int __rcsdi; } #define KRB5 diff --git a/source4/heimdal_build/gssapi-glue.c b/source4/heimdal_build/gssapi-glue.c index 0885c2165b0..c71b69463cc 100644 --- a/source4/heimdal_build/gssapi-glue.c +++ b/source4/heimdal_build/gssapi-glue.c @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lib/replace/replace.h" +#include "../replace/replace.h" void *__gss_ntlm_initialize(void) { |