* dtable.h (dtable::lock): Revert static.

(dtable::unlock): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c7f8be557f0ddca87138f72b50b359704e59faff..5ef5088ffd5ef5f5668d1eb4dab5eb6f3ce9a75f 100644 (file)
--- 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 1132a1aa9909c38017b3139140a91b2b3bee8dd3..53ffca3e2c8777a43d8043c3dd0ab2001a93a22d 100644 (file)
--- 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);