mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-02-02 10:00:38 +01:00
No need to include locale.h twice and don't try to call setlocale if it isn't available.
This commit is contained in:
parent
957b696b5c
commit
66a9deb737
2
extern/editline/src/eln.c
vendored
2
extern/editline/src/eln.c
vendored
@ -75,7 +75,7 @@ public const char *
|
||||
el_gets(EditLine *el, int *nread)
|
||||
{
|
||||
const wchar_t *tmp;
|
||||
//we don't want to ignore extended chars with UTF8 charsets /FSG 20011
|
||||
//we don't want to ignore extended chars with UTF8 charsets /FSG 2011
|
||||
if (!(el->el_flags & CHARSET_IS_UTF8))
|
||||
el->el_flags |= IGNORE_EXTCHARS;
|
||||
tmp = el_wgets(el, nread);
|
||||
|
@ -83,7 +83,6 @@
|
||||
// This is a local file included in our distribution - but not always
|
||||
// compiled into the system
|
||||
#include "editline.h"
|
||||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
enum literal_string_type
|
||||
@ -533,7 +532,7 @@ int CLIB_ROUTINE main(int argc, char* argv[])
|
||||
isqlGlob.major_ods = 0;
|
||||
isqlGlob.minor_ods = 0;
|
||||
|
||||
#ifdef HAVE_EDITLINE_H
|
||||
#if defined(HAVE_EDITLINE_H) || defined(HAVE_LOCALE_H)
|
||||
setlocale(LC_CTYPE, "");
|
||||
#endif
|
||||
int rc = ISQL_main(argc, argv);
|
||||
|
Loading…
Reference in New Issue
Block a user