Apply OSS consortium patch

Author: n-isaka

libvbisam/isdelete.c

@@ -186,7 +186,7 @@ isdelcurr (const int ihandle)
 }
 
 int
-isdelrec (const int ihandle, off_t trownumber)
+isdelrec (const int ihandle, vbisam_off_t trownumber)
 {
 	struct DICTINFO	*psvbptr;
 	int		iresult = 0;

libvbisam/ishelper.c

@@ -144,7 +144,7 @@ isrelease (const int ihandle)
 }
 
 int
-isrelrec (const int ihandle, const off_t trownumber)
+isrelrec (const int ihandle, const vbisam_off_t trownumber)
 {
 	struct DICTINFO	*psvbptr;
 
@@ -192,7 +192,7 @@ isrename (char *pcoldname, char *pcnewname)
 }
 
 int
-issetunique (const int ihandle, const off_t tuniqueid)
+issetunique (const int ihandle, const vbisam_off_t tuniqueid)
 {
 	struct DICTINFO *psvbptr;
 	off_t		tvalue;
@@ -223,7 +223,7 @@ issetunique (const int ihandle, const off_t tuniqueid)
 }
 
 int
-isuniqueid (const int ihandle, off_t *ptuniqueid)
+isuniqueid (const int ihandle, vbisam_off_t *ptuniqueid)
 {
 	struct DICTINFO *psvbptr;
 	off_t		tvalue;

libvbisam/isrewrite.c

@@ -295,7 +295,7 @@ isrewcurr (const int ihandle, char *pcrow)
 }
 
 int
-isrewrec (const int ihandle, const off_t trownumber, char *pcrow)
+isrewrec (const int ihandle, const vbisam_off_t trownumber, char *pcrow)
 {
 	struct DICTINFO	*psvbptr;
 	int		ideleted, inewreclen, ioldreclen = 0, iresult = 0;

libvbisam/vblowlevel.c

@@ -201,6 +201,7 @@ ivblock (const int ihandle, const off_t toffset, const off_t tlength, const int
 
 	OVERLAPPED	toverlapped;
 	DWORD		tflags = 0;
+	DWORD       winerrno = 0;
 	int		bunlock = 0;
 
 	if (!svbfile[ihandle].irefcount) {
@@ -248,6 +249,11 @@ ivblock (const int ihandle, const off_t toffset, const off_t tlength, const int
 			(int)(tlength >> 32), &toverlapped)) {
 			return 0;
 		}
+		winerrno = GetLastError();
+		if (winerrno = ERROR_NOT_LOCKED){
+			//ALREADY UNLOCKED **SAME FCNTL**
+			return 0;
+		}
 	}
 
 	errno = EBADARG;