summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2012-03-05 12:09:22 +0000
committerCorinna Vinschen <corinna@vinschen.de>2012-03-05 12:09:22 +0000
commit292cd759a1877e1ff76dd49ea447d591680138f5 (patch)
tree38b611a7888197ec345ddc4e27c7460528ae8f22
parent6cd8cb1dba1c9b317212779191ce8bf06a5a5e96 (diff)
downloadcygnal-292cd759a1877e1ff76dd49ea447d591680138f5.tar.gz
cygnal-292cd759a1877e1ff76dd49ea447d591680138f5.tar.bz2
cygnal-292cd759a1877e1ff76dd49ea447d591680138f5.zip
* init.cc (dll_entry): Move wincap.init call back from here...
* dcrt0.cc (dll_crt0_0): ...to here.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/dcrt0.cc3
-rw-r--r--winsup/cygwin/init.cc3
3 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b4ae19ced..90fcd96ed 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
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.
(class fcwd_access_t): Ditto. Only declare methods.
(class cwdstuff): Move fast_cwd_ptr and fast_cwd_version from shared
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 5cee5f16d..e7a35f219 100644
--- 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 c8d4d02db..1b245f581 100644
--- 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;