summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/dtable.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c7f8be557..5ef5088ff 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-17 Christopher Faylor <me.cygwin2014@cgf.cx>
+
+ * dtable.h (dtable::lock): Revert static.
+ (dtable::unlock): Ditto.
+
2014-01-17 Corinna Vinschen <corinna@vinschen.de>
* passwd.cc (setpassent): Align to BSD definition.
@@ -27,6 +32,7 @@
2014-01-16 Christopher Faylor <me.cygwin2014@cgf.cx>
* dtable.h (dtable::lock): Make static.
+ (dtable::unlock): Ditto.
2014-01-08 Christopher Faylor <me.cygwin2014@cgf.cx>
diff --git a/winsup/cygwin/dtable.h b/winsup/cygwin/dtable.h
index 1132a1aa9..53ffca3e2 100644
--- a/winsup/cygwin/dtable.h
+++ b/winsup/cygwin/dtable.h
@@ -85,8 +85,8 @@ public:
void delete_archetype (fhandler_base *);
void fixup_before_exec (DWORD win_proc_id);
void fixup_before_fork (DWORD win_proc_id);
- static void lock () {lock_process::locker.acquire ();}
- static void unlock () {lock_process::locker.release ();}
+ void lock () {lock_process::locker.acquire ();}
+ void unlock () {lock_process::locker.release ();}
};
fhandler_base *build_fh_dev (const device&, const char * = NULL);