build: Remove SMB_STRUCT_FLOCK define

diff --git a/source3/include/includes.h b/source3/include/includes.h
index e8f3c0bb341dfc5dfc655954ae834c618a30fdab..850c0748e9098d873c4835e2f513de6323915614 100644 (file)
--- 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 edad75d646b6ff61446ff52b6af2ed4dc8550176..c00b45f0b2834f7d80c12287ecefa28c1632d6cc 100644 (file)
--- 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 5fda3639508a372be5395049288b8be8c73547b7..f5c5b20ebd967a618ca7617e525c359ab83ff78b 100644 (file)
--- 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);