* resolution of eCos-vs.-sky merge conflict!

[deliverable/binutils-gdb.git] / gprof / gprof.c

diff --git a/gprof/gprof.c b/gprof/gprof.c
index b6e260cff8b70db92b38463f926a4b5f8d0a3b53..efb16b39df601168e8253be52f83d2c84e8dacc0 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -169,7 +169,9 @@ DEFUN (main, (argc, argv), int argc AND char **argv)
   Sym **cg = 0;
   int ch, user_specified = 0;
 
+#ifdef HAVE_SETLOCALE
   setlocale (LC_MESSAGES, "");
+#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
@@ -277,7 +279,7 @@ DEFUN (main, (argc, argv), int argc AND char **argv)
          print_path = TRUE;
          break;
        case 'm':
-         bb_min_calls = atoi (optarg);
+         bb_min_calls = (unsigned long) strtoul (optarg, (char **) NULL, 10);
          break;
        case 'n':
          sym_id_add (optarg, INCL_TIME);