* gprof.c (main): Conditionally call setlocale.

	* gprof.h: Include <locale.h> if HAVE_LOCALE_H.
	(LC_MESSAGES): Now can be defined even when ENABLE_NLS.

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index e22276a5f827b6d2e7df505779cafbbd7d14faaf..05ef412003f437603b47a8b61c0d36380d79a6e5 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 28 19:17:33 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * gprof.c (main): Conditionally call setlocale.
+       * gprof.h: Include <locale.h> if HAVE_LOCALE_H.
+       (LC_MESSAGES): Now can be defined even when ENABLE_NLS.
+
 Tue Apr 28 19:50:09 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * corefile.c: Rename from core.c.

diff --git a/gprof/gprof.c b/gprof/gprof.c
index b6e260cff8b70db92b38463f926a4b5f8d0a3b53..5438c913a2785c921a3ac9499bd0f78e76b3d689 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);
 

diff --git a/gprof/gprof.h b/gprof/gprof.h
index b0bc112bed7c50d09aee62f2d44c2f0204b057c8..01d6da47fa797f8ddc529abf697bb09f2d309d89 100644 (file)
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -51,29 +51,34 @@
 #define        GMONNAME        "gmon.out"      /* default profile filename */
 #define        GMONSUM         "gmon.sum"      /* profile summary filename */
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) gettext (String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
 #endif
+
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# define _(String) gettext (String)
+# ifdef gettext_noop
+#  define N_(String) gettext_noop (String)
+# else
+#  define N_(String) (String)
+# endif
 #else
 /* Stubs that do something close enough.  */
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,Message) (Message)
-#define dcgettext(Domain,Message,Type) (Message)
-#define bindtextdomain(Domain,Directory) (Domain)
-#define _(String) (String)
-#define N_(String) (String)
-/* In this case we don't care about the value.  */
-#ifndef LC_MESSAGES
-#define LC_MESSAGES 0
+# define textdomain(String) (String)
+# define gettext(String) (String)
+# define dgettext(Domain,Message) (Message)
+# define dcgettext(Domain,Message,Type) (Message)
+# define bindtextdomain(Domain,Directory) (Domain)
+# define _(String) (String)
+# define N_(String) (String)
 #endif
+
+#ifndef LC_MESSAGES
+# define LC_MESSAGES 0
 #endif
 
+
 /*
  * These may already be defined on some systems.  We could probably
  * just use the BFD versions of these, since BFD has already dealt