The branch, master has been updated via 3fa212af61cd334daf2b0ac6bb4c85e1db15230a (commit) from 1f12dc4409cc4964e708c29906fad1f81086ec01 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3fa212af61cd334daf2b0ac6bb4c85e1db15230a Author: Stefan Metzmacher <me...@samba.org> Date: Thu Jul 16 08:51:51 2009 +0200 s4:heimdal_build: try to fix the build on Solaris The problem seems to be #define flock rk_flock heimdal/../heimdal_build/replace.c: In function `rk_flock': heimdal/../heimdal_build/replace.c:64: error: storage size of 'lock' isn't known heimdal/../heimdal_build/replace.c:64: warning: unused variable `lock' metze ----------------------------------------------------------------------- Summary of changes: source4/heimdal_build/replace.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c index 6842b11..8c3def7 100644 --- a/source4/heimdal_build/replace.c +++ b/source4/heimdal_build/replace.c @@ -61,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; -- Samba Shared Repository