* dcrt0.cc: Remove ld_preload declaration.

* winsup.h: Move ld_preload declaration here.
* fork.cc (fork_child): Call ld_preload() before returning.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6b2c38eb07a900f4288d6dee817843092a22962d..a25faa53c5fd13c7df832e0cb53430b72b9ff958 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-11  Christopher Faylor  <cgf@timesys.com>
+
+       * dcrt0.cc: Remove ld_preload declaration.
+       * winsup.h: Move ld_preload declaration here.
+       * fork.cc (fork_child): Call ld_preload() before returning.
+
 2005-08-11  Christopher Faylor  <cgf@timesys.com>
 
        * child_info.  (CURR_CHILD_INFO_MAGIC): Refresh.

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 7cc3ea9686450e298baa4abbc6efc3949703e07e..e25e844c4ca0e06ec84c0f1211b52686037a5a03 100644 (file)
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -43,8 +43,6 @@ details. */
 
 extern "C" void cygwin_exit (int) __attribute__ ((noreturn));
 
-void ld_preload ();
-
 HANDLE NO_COPY hMainProc = (HANDLE) -1;
 HANDLE NO_COPY hMainThread;
 HANDLE NO_COPY hProcToken;

diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 6ed515b64fc6a60b9e9cc6636a72cfa44ba151eb..785aabd4f26bfc17c4a491864a88991173fb703e 100644 (file)
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -242,6 +242,7 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls)
   fixup_timers_after_fork ();
   fixup_hooks_after_fork ();
   cygbench ("fork-child");
+  ld_preload ();
   cygwin_finished_initializing = true;
   return 0;
 }

diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 3c289685bcd83626d4cb34ce62afe1dfd64eacb7..fdc8566d7836b8d54eb484b1cbb89b7eb4c951aa 100644 (file)
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -236,6 +236,8 @@ extern HANDLE netapi32_handle;
 extern "C" void error_start_init (const char*);
 extern "C" int try_to_debug (bool waitloop = 1);
 
+extern void ld_preload ();
+
 void set_file_api_mode (codepage_type);
 
 extern bool cygwin_finished_initializing;
@@ -264,8 +266,10 @@ void __stdcall to_timestruc_t (FILETIME *, timestruc_t *);
 void __stdcall time_as_timestruc_t (timestruc_t *);
 void __stdcall timeval_to_filetime (const struct timeval *, FILETIME *);
 
+/* Console related */
 void __stdcall set_console_title (char *);
 void init_console_handler (BOOL);
+
 void init_global_security ();
 
 int __stdcall check_invalid_virtual_addr (const void *s, unsigned sz) __attribute__ ((regparm(2)));