Mercurial > libpst

diff src/pst2ldif.cpp @ 114:e213bfcf9aa7 stable-0-6-24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch from Chris Eagle to build on cygwin
author Carl Byington <carl@five-ten-sg.com>
date Thu, 11 Dec 2008 11:58:22 -0800
parents 1b2a4fac1303
children 0f1492b7fe8b
line wrap: on
line diff
--- a/src/pst2ldif.cpp	Thu Dec 04 10:46:42 2008 -0800
+++ b/src/pst2ldif.cpp	Thu Dec 11 11:58:22 2008 -0800
@@ -371,7 +371,7 @@
 
         iconv(cd, NULL, NULL, NULL, NULL);
         p = buffer;
-        int ret = iconv(cd, &p, &inlen, &utf8_p, &utf8_len);
+        int ret = iconv(cd, (ICONV_CONST char**)&p, &inlen, &utf8_p, &utf8_len);
 
         if (ret >= 0) {
             *utf8_p = 0;
@@ -657,7 +657,7 @@
 }
 
 
-int usage() {
+int32_t usage() {
     version();
     printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
     printf("OPTIONS:\n");
@@ -673,7 +673,7 @@
 }
 
 
-int version() {
+int32_t version() {
     printf("pst2ldif v%s\n", VERSION);
 #if BYTE_ORDER == BIG_ENDIAN
     printf("Big Endian implementation being used.\n");
@@ -745,7 +745,7 @@
         utf8_buffer = (char *)malloc(utf8_len);
         utf8_p = utf8_buffer;
         iconv(cd, NULL, NULL, NULL, NULL);
-        if (iconv(cd, &p, &inlen, &utf8_p, &utf8_len) >= 0) {
+        if (iconv(cd, (ICONV_CONST char**)&p, &inlen, &utf8_p, &utf8_len) >= 0) {
             *utf8_p = 0;
             value = utf8_buffer;
         }