* init.cc (dll_entry): Move wincap.init call back from here...

	* dcrt0.cc (dll_crt0_0): ...to here.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b4ae19ced70e679bdc5f6b6196a2d72db467c909..90fcd96ed25f98afd794a41165e0e1aa9b7d2ec3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-05  Corinna Vinschen  <corinna@vinschen.de>
+
+       * init.cc (dll_entry): Move wincap.init call back from here...
+       * dcrt0.cc (dll_crt0_0): ...to here.
+
 2012-03-05  Corinna Vinschen  <corinna@vinschen.de>
 
        * cygheap.h (enum fcwd_version_t): Move here from path.cc.

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 5cee5f16d3be130cdb884e06cb6faf2eb4ffe625..e7a35f219aea072dee7a6f8711027ca655485ffb 100644 (file)
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -1,7 +1,7 @@
 /* dcrt0.cc -- essentially the main() for the Cygwin dll
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
+   2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -683,6 +683,7 @@ init_windows_system_directory ()
 void
 dll_crt0_0 ()
 {
+  wincap.init ();
   child_proc_info = get_cygwin_startup_info ();
   init_windows_system_directory ();
   init_global_security ();

diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index c8d4d02dbc50030d21a698904e66a7ccd3661ef7..1b245f58167dfaa5a7eb59d9a95f63894da65b20 100644 (file)
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -1,7 +1,7 @@
 /* init.cc
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
+   2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -74,7 +74,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
   switch (reason)
     {
     case DLL_PROCESS_ATTACH:
-      wincap.init ();
       init_console_handler (false);
 
       cygwin_hmodule = (HMODULE) h;