mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-10 04:43:03 +00:00
maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC.
* bootstrap.conf (gnulib_modules): Require progname.
* src/complain.c, src/getargs.c, src/getargs.h, src/main.c: Use it.
* cfg.mk (exclude): New.
Use it.
Skip lib/main.c for bindtextdomain and set_program_name.
(cherry picked from commit 4d699f44e6)
Conflicts:
cfg.mk
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include "system.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <progname.h>
|
||||
|
||||
#include "complain.h"
|
||||
#include "files.h"
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
|
||||
#endif
|
||||
|
||||
#include <progname.h>
|
||||
|
||||
#include "complain.h"
|
||||
#include "files.h"
|
||||
#include "getargs.h"
|
||||
@@ -79,8 +81,6 @@ int language_prio = default_prio;
|
||||
struct bison_language const *language = &valid_languages[0];
|
||||
const char *include = NULL;
|
||||
|
||||
char *program_name;
|
||||
|
||||
|
||||
/** Decode an option's set of keys.
|
||||
*
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
#include "location.h"
|
||||
|
||||
extern char *program_name;
|
||||
enum { command_line_prio, grammar_prio, default_prio };
|
||||
|
||||
/* flags set by % directives */
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <bitset_stats.h>
|
||||
#include <bitset.h>
|
||||
#include <configmake.h>
|
||||
#include <progname.h>
|
||||
#include <quotearg.h>
|
||||
#include <timevar.h>
|
||||
|
||||
@@ -57,7 +58,7 @@
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
program_name = argv[0];
|
||||
set_program_name (argv[0]);
|
||||
setlocale (LC_ALL, "");
|
||||
(void) bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
(void) bindtextdomain ("bison-runtime", LOCALEDIR);
|
||||
|
||||
Reference in New Issue
Block a user