diff options
| author | John H Terpstra <jht@samba.org> | 2009-07-23 09:33:06 -0500 |
|---|---|---|
| committer | John H Terpstra <jht@samba.org> | 2009-07-23 09:33:06 -0500 |
| commit | 94717ae8e5dfe2ccdb7f3557d5490708b00ae471 (patch) | |
| tree | a39f669faf23ad05497963cf5ccf611467d0145b /source4/heimdal_build/replace.c | |
| parent | 14952c72a29ec92badb1bcf16d2a15fe100f060d (diff) | |
| parent | 7bad4b48c82fed4263c2bfe97a4d00b47913604a (diff) | |
| download | samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.tar.gz samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.tar.bz2 samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.zip | |
Merge branch 'master' of ssh://jht@git.samba.org/data/git/samba
Diffstat (limited to 'source4/heimdal_build/replace.c')
| -rw-r--r-- | source4/heimdal_build/replace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c index ba43dd9495..8c3def7dca 100644 --- a/source4/heimdal_build/replace.c +++ b/source4/heimdal_build/replace.c @@ -21,11 +21,9 @@ */ #include "config.h" -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> #include "err.h" #include "roken.h" +#include "system/filesys.h" #ifndef HAVE_ERR void err(int eval, const char *format, ...) @@ -63,6 +61,7 @@ #ifndef HAVE_FLOCK int flock(int fd, int op) { +#undef flock struct flock lock; lock.l_whence = 0; lock.l_start = 0; |