summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-28 13:26:34 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-04-05 02:39:09 +0200
commit6098f8d80cb37fba7d2f245ee1a5c184b0f27aea (patch)
tree22452358512adf744eb7e370ca7a0243c0add799
parentf6e053202481631b12d75f6a552ee1aa8b355064 (diff)
downloadsamba-6098f8d80cb37fba7d2f245ee1a5c184b0f27aea.tar.gz
samba-6098f8d80cb37fba7d2f245ee1a5c184b0f27aea.tar.bz2
samba-6098f8d80cb37fba7d2f245ee1a5c184b0f27aea.zip
build: Remove SMB_STRUCT_FLOCK define
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/passdb/pdb_smbpasswd.c2
3 files changed, 2 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index e8f3c0bb34..850c0748e9 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -371,10 +371,6 @@ typedef struct stat_ex SMB_STRUCT_STAT;
* Defines for 64 bit fcntl locks.
*/
-#ifndef SMB_STRUCT_FLOCK
-# define SMB_STRUCT_FLOCK struct flock
-#endif
-
#ifndef SMB_F_SETLKW
# define SMB_F_SETLKW F_SETLKW
#endif
diff --git a/source3/lib/util.c b/source3/lib/util.c
index edad75d646..c00b45f0b2 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1215,7 +1215,7 @@ void set_namearray(name_compare_entry **ppname_array, const char *namelist_in)
bool fcntl_getlock(int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
{
- SMB_STRUCT_FLOCK lock;
+ struct flock lock;
int ret;
DEBUG(8,("fcntl_getlock fd=%d offset=%.0f count=%.0f type=%d\n",
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 5fda363950..f5c5b20ebd 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -87,7 +87,7 @@ static void gotalarm_sig(int signum)
static bool do_file_lock(int fd, int waitsecs, int type)
{
- SMB_STRUCT_FLOCK lock;
+ struct flock lock;
int ret;
void (*oldsig_handler)(int);