[Firebird-checkins] SF.net SVN: firebird:[58620] firebird/trunk

[<fs...@us...>]

Revision: 58620
          http://sourceforge.net/p/firebird/code/58620
Author:   fsg
Date:     2013-09-14 15:22:37 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
No need to include locale.h twice and don't try to call setlocale if it isn't available.

Modified Paths:
--------------
    firebird/trunk/extern/editline/src/eln.c
    firebird/trunk/src/isql/isql.epp

Modified: firebird/trunk/extern/editline/src/eln.c
===================================================================
--- firebird/trunk/extern/editline/src/eln.c	2013-09-14 13:15:30 UTC (rev 58619)
+++ firebird/trunk/extern/editline/src/eln.c	2013-09-14 15:22:37 UTC (rev 58620)
@@ -75,7 +75,7 @@
 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);

Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp	2013-09-14 13:15:30 UTC (rev 58619)
+++ firebird/trunk/src/isql/isql.epp	2013-09-14 15:22:37 UTC (rev 58620)
@@ -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 @@
 	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);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.