mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 18:24:48 +00:00
parent
0271602b8d
commit
826b704b31
@ -35,7 +35,7 @@ int main(int argc, char * argv[])
|
||||
// early as possible.
|
||||
lyx::lyxerr.setStream(cerr);
|
||||
|
||||
lyx::support::os::init(argc, argv);
|
||||
lyx::support::os::init(argc, &argv);
|
||||
|
||||
lyx::LyX the_lyx_instance;
|
||||
|
||||
|
@ -38,7 +38,7 @@ enum file_access {
|
||||
};
|
||||
|
||||
/// Do some work just once.
|
||||
void init(int argc, char * argv[]);
|
||||
void init(int argc, char ** argv[]);
|
||||
|
||||
/// Returns the i-th program argument in utf8 encoding.
|
||||
std::string utf8_argv(int i);
|
||||
|
@ -210,10 +210,10 @@ BOOL terminate_handler(DWORD event)
|
||||
|
||||
} // namespace anon
|
||||
|
||||
void init(int argc, char * argv[])
|
||||
void init(int argc, char ** argv[])
|
||||
{
|
||||
argc_ = argc;
|
||||
argv_ = argv;
|
||||
argv_ = *argv;
|
||||
|
||||
// Set environment's default locale
|
||||
setlocale(LC_ALL, "");
|
||||
|
@ -45,10 +45,10 @@ char ** argv_ = 0;
|
||||
|
||||
} // namespace anon
|
||||
|
||||
void init(int argc, char * argv[])
|
||||
void init(int argc, char ** argv[])
|
||||
{
|
||||
argc_ = argc;
|
||||
argv_ = argv;
|
||||
argv_ = *argv;
|
||||
|
||||
// Set environment's default locale
|
||||
setlocale(LC_ALL, "");
|
||||
|
@ -99,7 +99,7 @@ BOOL terminate_handler(DWORD event)
|
||||
|
||||
} // namespace anon
|
||||
|
||||
void init(int argc, char * argv[])
|
||||
void init(int argc, char ** argv[])
|
||||
{
|
||||
/* Note from Angus, 17 Jan 2005:
|
||||
*
|
||||
@ -158,6 +158,22 @@ void init(int argc, char * argv[])
|
||||
*/
|
||||
|
||||
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1900)
|
||||
// Removing an argument from argv leads to an assertion on Windows
|
||||
// when compiling with MSVC 2015 in debug mode (see bug #10440).
|
||||
// To avoid this we make a copy of the array of pointers.
|
||||
char ** newargv = (char **) malloc((argc + 1) * sizeof(char *));
|
||||
if (newargv) {
|
||||
memcpy(newargv, *argv, (argc + 1) * sizeof(char *));
|
||||
*argv = newargv;
|
||||
} else {
|
||||
lyxerr << "LyX warning: Cannot make a copy of "
|
||||
"command line arguments!"
|
||||
<< endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// Get the wide program arguments array
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1900)
|
||||
argv_ = CommandLineToArgvW(GetCommandLineW(), &argc_);
|
||||
|
@ -115,7 +115,7 @@ bool test_Layout(string const & input, string const & output)
|
||||
|
||||
int main(int argc, char * argv[])
|
||||
{
|
||||
os::init(argc, argv);
|
||||
os::init(argc, &argv);
|
||||
lyxerr.setStream(cerr);
|
||||
if (argc < 2 || argc > 3) {
|
||||
cerr << "Usage: " << argv[0] << " <input layout file> [<output layout file>]\n";
|
||||
|
@ -1178,7 +1178,7 @@ int main(int argc, char * argv[])
|
||||
|
||||
lyx::lyxerr.setStream(cerr);
|
||||
|
||||
os::init(argc, argv);
|
||||
os::init(argc, &argv);
|
||||
|
||||
lyx::TeX2LyXApp app(argc, argv);
|
||||
return app.exec();
|
||||
|
@ -96,6 +96,9 @@ What's new
|
||||
|
||||
* DOCUMENT INPUT/OUTPUT
|
||||
|
||||
- Conversion of files using the command line (e.g. for batch processing) is
|
||||
again possible on Windows (bug 10440).
|
||||
|
||||
- Fix nested language handling with polyglossia (bug 9633).
|
||||
|
||||
- Fix usage of multiple varieties of the same polyglossia language.
|
||||
|
Loading…
Reference in New Issue
Block a user