Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27988
Modified Files:
Tag: MonetDB_5-0
mserver5.mx.in
Log Message:
back port of setlocale fix (sorry only had current version on sun available)
Index: mserver5.mx.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/mserver5.mx.in,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- mserver5.mx.in 2 Jun 2007 09:56:20 -0000 1.11
+++ mserver5.mx.in 5 Jun 2007 18:33:52 -0000 1.11.2.1
@@ -79,6 +79,7 @@
#include <stdio.h>
#include <errno.h>
#include <string.h> /* strerror */
+#include <locale.h>
#ifdef _CRTDBG_MAP_ALLOC
/* Windows only:
@@ -383,11 +384,9 @@
#if defined(_MSC_VER) && defined(__cplusplus)
set_terminate(mserver_abort);
#endif
-/* should be looked into
- if (setlocale(LC_CTYPE, "") == NULL){
- GDKfatal( "cannot set locale\n");
+ if (setlocale(LC_CTYPE, "") == NULL) {
+ GDKfatal("cannot set locale\n");
}
-*/
#ifdef HAVE_MALLOPT
@:mallopt@
@@ -617,6 +616,7 @@
callString(mal_clients, input, listing);
GDKfree(input);
}
+
if (GDKgetenv("mal_listing"))
sscanf(GDKgetenv("mal_listing"), "%d", &listing);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
