* fhandler.h (fhandler_base::close_with_arch): Make non-virtual.

(fhandler_base::open_fs): Move closer to it's close counterpart.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 952ec86c5548b5cd264eec80843172afed43bd92..50624fb62487331eb1243b20d1e6053d6b69a27d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-06  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+       * fhandler.h (fhandler_base::close_with_arch): Make non-virtual.
+       (fhandler_base::open_fs): Move closer to it's close counterpart.
+
 2011-05-06  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
        * fhandler.cc (fhandler_base::dup): Avoid duping a handle when an

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 1c066ff64974ccd1d1f453e54ba3387fa961bac3..9d84d9d444ae1ce97bbe1fe272b5fc3a24b992ee 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -299,8 +299,7 @@ class fhandler_base
   virtual int open (int, mode_t);
   virtual void open_setup (int flags) { return; }
 
-  int open_fs (int, mode_t = 0);
-  virtual int close_with_arch ();
+  int close_with_arch ();
   virtual int close ();
   virtual void cleanup () { return; }
   int _archetype_usecount (const char *fn, int ln, int n)
@@ -312,6 +311,8 @@ class fhandler_base
       strace.prntf (_STRACE_ALL, fn, "line %d:  %s<%p> usecount + %d = %d", ln, get_name (), archetype, n, archetype->usecount);
     return archetype->usecount;
   }
+
+  int open_fs (int, mode_t = 0);
 # define archetype_usecount(n) _archetype_usecount (__PRETTY_FUNCTION__, __LINE__, (n))
   int close_fs () { return fhandler_base::close (); }
   virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));