This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
NLS fix
- To: egcs-patches at cygnus dot com
- Subject: NLS fix
- From: Jeffrey A Law <law at cygnus dot com>
- Date: Sat, 30 Jan 1999 15:30:33 -0700
- Reply-To: law at cygnus dot com
This fixes compilation failures for systems that have setlocale, but which
do not have LC_MESSAGES.
* cccp.c (main): Only call setlocale (LC_MESSAGES, ...) if LC_MESSAGES
is defined.
* collect2.c (main): Likewise.
* cppmain.c (main): Likewise.
* gcc.c (main): Likewise.
* gcov.c (main): Likewise.
* protoize.c (main): Likewise.
* toplev.c (main): Likewise.
Index: gcc/cccp.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cccp.c,v
retrieving revision 1.59
diff -c -3 -p -r1.59 cccp.c
*** cccp.c 1999/01/29 04:18:00 1.59
--- cccp.c 1999/01/30 21:25:59
*************** main (argc, argv)
*** 1265,1271 ****
--- 1265,1273 ----
signal (SIGPIPE, pipe_closed);
#endif
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);
Index: gcc/collect2.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/collect2.c,v
retrieving revision 1.65
diff -c -3 -p -r1.65 collect2.c
*** collect2.c 1999/01/29 12:10:48 1.65
--- collect2.c 1999/01/30 21:26:00
*************** main (argc, argv)
*** 1002,1008 ****
--- 1002,1010 ----
int first_file;
int num_c_args = argc+9;
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);
Index: gcc/cppmain.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cppmain.c,v
retrieving revision 1.10
diff -c -3 -p -r1.10 cppmain.c
*** cppmain.c 1999/01/27 01:42:09 1.10
--- cppmain.c 1999/01/30 21:26:00
*************** main (argc, argv)
*** 69,75 ****
--- 69,77 ----
while (p != argv[0] && p[-1] != '/') --p;
progname = p;
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);
Index: gcc/gcc.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/gcc.c,v
retrieving revision 1.87
diff -c -3 -p -r1.87 gcc.c
*** gcc.c 1999/01/27 01:42:25 1.87
--- gcc.c 1999/01/30 21:26:01
*************** main (argc, argv)
*** 4627,4633 ****
--- 4627,4635 ----
while (p != argv[0] && p[-1] != '/' && p[-1] != DIR_SEPARATOR) --p;
programname = p;
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);
Index: gcc/gcov.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/gcov.c,v
retrieving revision 1.14
diff -c -3 -p -r1.14 gcov.c
*** gcov.c 1999/01/27 01:42:26 1.14
--- gcov.c 1999/01/30 21:26:02
*************** main (argc, argv)
*** 225,231 ****
--- 225,233 ----
int argc;
char **argv;
{
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);
Index: gcc/protoize.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/protoize.c,v
retrieving revision 1.33
diff -c -3 -p -r1.33 protoize.c
*** protoize.c 1999/01/27 01:42:36 1.33
--- protoize.c 1999/01/30 21:26:02
*************** main (argc, argv)
*** 4555,4561 ****
--- 4555,4563 ----
pname = strrchr (argv[0], '/');
pname = pname ? pname+1 : argv[0];
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);
Index: gcc/toplev.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/toplev.c,v
retrieving revision 1.149
diff -c -3 -p -r1.149 toplev.c
*** toplev.c 1999/01/29 12:10:46 1.149
--- toplev.c 1999/01/30 21:26:09
*************** main (argc, argv)
*** 4576,4582 ****
--- 4576,4584 ----
}
#endif
+ #ifdef HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
+ #endif
bindtextdomain (PACKAGE, localedir);
textdomain (PACKAGE);