2001-10-30 Fred Fish <fnf@redhat.com>

	* somsolib.c (som_solib_add): A megabyte is 1024*1024 bytes.
	* pa64solib.c (add_to_solist): Ditto.
	* win32-nat.c (_initialize_inftarg): Remove unnecessary
	initialization of auto_solib_add, it defaults to 1.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cdbd53180063e1d19002731c54fbe4247b0845c4..869fc7084b541d11370410990485f1f5b897c4f8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-30  Fred Fish  <fnf@redhat.com>
+
+       * somsolib.c (som_solib_add): A megabyte is 1024*1024 bytes.
+       * pa64solib.c (add_to_solist): Ditto.
+       * win32-nat.c (_initialize_inftarg): Remove unnecessary
+       initialization of auto_solib_add, it defaults to 1.
+
 2001-10-27  Fred Fish  <fnf@redhat.com>
 
        * symfile.c (auto_solib_add): Update comment to note that

diff --git a/gdb/pa64solib.c b/gdb/pa64solib.c
index e39d9e32c7899860e14dc122f9d3a59b15b9f037..441095e92a76a4032a9aa0c0c81a7a99460032a0 100644 (file)
--- a/gdb/pa64solib.c
+++ b/gdb/pa64solib.c
@@ -1168,7 +1168,7 @@ add_to_solist (boolean from_tty, char *dll_path,
        !from_tty 
     && auto_solib_add
     && (  (st_size + pa64_solib_total_st_size) 
-       > (auto_solib_limit * (LONGEST)1000000));
+       > (auto_solib_limit * (LONGEST) (1024 * 1024)));
   if (pa64_solib_st_size_threshhold_exceeded)
     {
       pa64_solib_add_solib_objfile (new_so, dll_path, from_tty, 1);

diff --git a/gdb/somsolib.c b/gdb/somsolib.c
index f9807ab3ca3f273f33f899187a0c1fc8d194642f..5f2b2cbc88f80d5d965e78aec187548b2f55280d 100644 (file)
--- a/gdb/somsolib.c
+++ b/gdb/somsolib.c
@@ -778,7 +778,7 @@ som_solib_add (char *arg_string, int from_tty, struct target_ops *target)
       som_solib_st_size_threshold_exceeded =
        !from_tty &&
        auto_solib_add &&
-       ((st_size + som_solib_total_st_size) > (auto_solib_limit * (LONGEST) 1000000));
+       ((st_size + som_solib_total_st_size) > (auto_solib_limit * (LONGEST) (1024 * 1024)));
 
       if (som_solib_st_size_threshold_exceeded)
        {

diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 0e2fb5dc3e1bd24ff0b24c0b33f01dd86e39b4dc..884f2b40582fa299c5009e443e72c466120d32a9 100644 (file)
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -1453,7 +1453,6 @@ _initialize_inftarg (void)
               "Load dll library symbols from FILE.");
   c->completer = filename_completer;
 
-  auto_solib_add = 1;
   add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1);
 
   add_show_from_set (add_set_cmd ("new-console", class_support, var_boolean,

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 0e2fb5dc3e1bd24ff0b24c0b33f01dd86e39b4dc..884f2b40582fa299c5009e443e72c466120d32a9 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1453,7 +1453,6 @@ _initialize_inftarg (void)
               "Load dll library symbols from FILE.");
   c->completer = filename_completer;
 
-  auto_solib_add = 1;
   add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1);
 
   add_show_from_set (add_set_cmd ("new-console", class_support, var_boolean,