diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:32:54 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | 1ac7f071ce2191599b99eddfb4fb595d2d1f474f (patch) | |
| tree | a83cf9e1d4a96849a30d9761b16b60d2ff39177f /source3/lib | |
| parent | 6098f8d80cb37fba7d2f245ee1a5c184b0f27aea (diff) | |
| download | samba-1ac7f071ce2191599b99eddfb4fb595d2d1f474f.tar.gz samba-1ac7f071ce2191599b99eddfb4fb595d2d1f474f.tar.bz2 samba-1ac7f071ce2191599b99eddfb4fb595d2d1f474f.zip | |
build: Remove SMB_F* locking defines
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/pidfile.c | 4 | ||||
| -rw-r--r-- | source3/lib/util.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c index f1c89ebaf3..ec2044f327 100644 --- a/source3/lib/pidfile.c +++ b/source3/lib/pidfile.c @@ -92,7 +92,7 @@ pid_t pidfile_pid(const char *program_name) goto noproc; } - if (fcntl_lock(fd,SMB_F_SETLK,0,1,F_RDLCK)) { + if (fcntl_lock(fd,F_SETLK,0,1,F_RDLCK)) { /* we could get the lock - it can't be a Samba process */ goto noproc; } @@ -155,7 +155,7 @@ void pidfile_create(const char *program_name) exit(1); } - if (fcntl_lock(fd,SMB_F_SETLK,0,1,F_WRLCK)==False) { + if (fcntl_lock(fd,F_SETLK,0,1,F_WRLCK)==False) { DEBUG(0,("ERROR: %s : fcntl lock of file %s failed. Error was %s\n", name, pidFile_name, strerror(errno))); exit(1); diff --git a/source3/lib/util.c b/source3/lib/util.c index c00b45f0b2..22fc1e7abe 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1227,7 +1227,7 @@ bool fcntl_getlock(int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pi lock.l_len = *pcount; lock.l_pid = 0; - ret = sys_fcntl_ptr(fd,SMB_F_GETLK,&lock); + ret = sys_fcntl_ptr(fd,F_GETLK,&lock); if (ret == -1) { int sav = errno; |