From d9b791db8eaec67822ddd10a993b633391a9abc6 Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Sun, 4 Mar 2001 14:14:33 +0000
Subject: [PATCH] more and more new fixes

---
 docs/notework.txt       |  2 ++
 goldlib/gall/gfilutil.h |  3 +++
 goldlib/gall/gshare.h   | 10 +---------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/docs/notework.txt b/docs/notework.txt
index 085ed1c..da98c60 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,8 @@ ______________________________________________________________________
                  Notes for GoldED+ 1.1.5, March xx 2001
 ______________________________________________________________________
 
+! Fixed filelocking in UNIX version.
+
 - Fixed "Via" kludge handling in JAM areas.
 
 ! Quote wrapping algorithm slightly changed.
diff --git a/goldlib/gall/gfilutil.h b/goldlib/gall/gfilutil.h
index 8e104d1..830efe2 100644
--- a/goldlib/gall/gfilutil.h
+++ b/goldlib/gall/gfilutil.h
@@ -228,6 +228,9 @@ inline int eof(int h) {
 }
 
 inline int sopen(const char* path, int access, int shflag, int mode) {
+#ifdef __UNIX__
+  shflag = 0;
+#endif
   return open(path, access|shflag, mode);
 }
 
diff --git a/goldlib/gall/gshare.h b/goldlib/gall/gshare.h
index a6bbe7d..268270e 100644
--- a/goldlib/gall/gshare.h
+++ b/goldlib/gall/gshare.h
@@ -39,19 +39,11 @@
 #if defined(__MINGW32__)        // SH_COMPAT doesn't work in Mingw32
 #undef SH_COMPAT
 #endif
-#elif defined(__CYGWIN__)
+#elif !defined(SH_DENYNO)
 #define	SH_DENYRW	0x10	// Deny read/write
 #define	SH_DENYWR	0x20	// Deny write
 #define	SH_DENYRD	0x30	// Deny read
 #define	SH_DENYNO	0x40	// Deny nothing
-#else
-#ifndef SH_DENYNO
-#define SH_DENYNO 0
-#define SH_DENYRD 0
-#define SH_DENYWR 0
-#define SH_DENYRW 0
-#define SH_COMPAT 0
-#endif
 #endif
 
 #ifndef SH_COMPAT