import gdb-19990422 snapshot

[deliverable/binutils-gdb.git] / gdb / win32-nat.c

diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 04d8a9eff43c84d0cc240e6c16d94be67a978197..87e96bd23ac96bf45c1d644985ed58720beca268 100644 (file)
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -64,7 +64,7 @@
 extern struct target_ops child_ops;
 
 static void child_stop PARAMS ((void));
-static int child_thread_alive PARAMS ((int));
+static int win32_child_thread_alive PARAMS ((int));
 
 static int last_sig = 0;       /* Set if a signal was received from the
                                   debugged process */
@@ -302,7 +302,7 @@ child_store_inferior_registers (int r)
    of error; store status through argument pointer OURSTATUS.  */
 
 static int
-handle_load_dll (char *dummy)
+handle_load_dll (PTR dummy)
 {
   LOAD_DLL_DEBUG_INFO * event = &current_event.u.LoadDll;
   DWORD dll_name_ptr;
@@ -424,7 +424,7 @@ handle_load_dll (char *dummy)
      FIXME: Is this the real reason that we need the 0x1000 ? */
 
   printf_unfiltered ("%x:%s", event->lpBaseOfDll, dll_name);
-  symbol_file_add (dll_name, 0, (int) event->lpBaseOfDll + 0x1000, 0, 0, 0);
+  symbol_file_add (dll_name, 0, (int) event->lpBaseOfDll + 0x1000, 0, 0, 0, 0, 1);
   printf_unfiltered ("\n");
 
 out:
@@ -1003,7 +1003,8 @@ child_close ()
 
 struct target_ops child_ops ;
 
-static void init_child_ops(void)
+static void 
+init_child_ops(void)
 {
   child_ops.to_shortname =   "child";
   child_ops.to_longname =   "Win32 child process";
@@ -1033,7 +1034,7 @@ static void init_child_ops(void)
   child_ops.to_mourn_inferior =   child_mourn_inferior;
   child_ops.to_can_run  =   child_can_run;
   child_ops.to_notice_signals =   0;
-  child_ops.to_thread_alive  =   child_thread_alive;
+  child_ops.to_thread_alive  =   win32_child_thread_alive;
   child_ops.to_stop  =   child_stop;
   child_ops.to_stratum =   process_stratum;
   child_ops.DONT_USE =   0;
@@ -1102,7 +1103,7 @@ _initialize_inftarg ()
    by "polling" it.  If WaitForSingleObject returns WAIT_OBJECT_0
    it means that the pid has died.  Otherwise it is assumed to be alive. */
 static int
-child_thread_alive (int pid)
+win32_child_thread_alive (int pid)
 {
   return WaitForSingleObject(thread_rec (pid, FALSE)->h, 0) == WAIT_OBJECT_0 ?
         FALSE : TRUE;