Update of /cvsroot/monetdb/clients/src/mapiclient
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30812/src/mapiclient
Modified Files:
Makefile.ag MapiClient.mx
Log Message:
Get this thing compiled on Windows again.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/Makefile.ag,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.ag 17 Oct 2007 12:04:53 -0000 1.10
+++ Makefile.ag 7 Dec 2007 08:43:08 -0000 1.11
@@ -15,9 +15,9 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = -I.. $(MONETDB_INCS) $(READLINE_INCS) $(OPENSSL_INCS)
+INCLUDES = -I.. $(MONETDB_INCS) $(READLINE_INCS) $(OPENSSL_INCS)
$(ICONV_CFLAGS)
-MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS)
+MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS) $(ICONV_LIBS)
lib_mcutil = {
NOINST
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- MapiClient.mx 5 Dec 2007 16:37:09 -0000 1.92
+++ MapiClient.mx 7 Dec 2007 08:43:08 -0000 1.93
@@ -1658,13 +1658,17 @@
break;
case 'l':
/* accept unambiguous prefix of language */
- if (strcmp(optarg, "sql") == 0 || strcmp(optarg, "sq")
== 0 || strcmp(optarg, "s") == 0) {
+ if (strcmp(optarg, "sql") == 0 ||
+ strcmp(optarg, "sq") == 0 ||
+ strcmp(optarg, "s") == 0) {
language = "sql";
mode = SQL;
- } else if (strcmp(optarg, "mil") == 0 || strcmp(optarg,
"mi") == 0) {
+ } else if (strcmp(optarg, "mil") == 0 ||
+ strcmp(optarg, "mi") == 0) {
language = "mil";
mode = MIL;
- } else if (strcmp(optarg, "mal") == 0 || strcmp(optarg,
"ma") == 0) {
+ } else if (strcmp(optarg, "mal") == 0 ||
+ strcmp(optarg, "ma") == 0) {
language = "mal";
mode = MAL;
@@ -1758,22 +1762,11 @@
}
#ifdef HAVE_ICONV
- if (encoding == NULL) {
#ifdef HAVE_NL_LANGINFO
+ if (encoding == NULL)
encoding = nl_langinfo(CODESET);
-#else
-#ifdef NATIVE_WIN32
- UINT cp = GetOEMCP();
-
- if (cp != 0) {
- encoding = malloc(10);
- snprintf(encoding, 10, "cp%d", cp);
-
- }
#endif
-#endif
- }
- if (strcasecmp(encoding, "utf-8") == 0)
+ if (encoding != NULL && strcasecmp(encoding, "utf-8") == 0)
encoding = NULL;
if (encoding != NULL) {
toConsole = iconv_wstream(toConsole, encoding, "stdout");
@@ -1787,7 +1780,7 @@
if ((cd_in = iconv_open("utf-8", encoding)) == (iconv_t) -1)
fprintf(stderr, "%s: warning: cannot convert UTF-8 to
local character set %s\n", argv[0], encoding);
}
-#endif
+#endif /* HAVE_ICONV */
/* default to administrator account (eeks) when being called without
* any arguments, default to the current user if -u flag is given */
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
