changeset 160:252ad66d3d6e stable-0-6-32

fix ppc64 compile error
author Carl Byington <carl@five-ten-sg.com>
date Sat, 14 Mar 2009 17:45:48 -0700
parents 3508c24d3cd2
children 3418238889ab
files ChangeLog NEWS configure.in libpst.spec.in src/libpst.c src/pst2ldif.cpp
diffstat 6 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Mar 14 17:23:39 2009 -0700
+++ b/ChangeLog	Sat Mar 14 17:45:48 2009 -0700
@@ -1,3 +1,8 @@
+LibPST 0.6.32 (2009-03-14)
+===============================
+
+    * fix ppc64 compile error.
+
 LibPST 0.6.31 (2009-03-14)
 ===============================
 
--- a/NEWS	Sat Mar 14 17:23:39 2009 -0700
+++ b/NEWS	Sat Mar 14 17:45:48 2009 -0700
@@ -1,3 +1,4 @@
+0.6.32  2009-03-14 fix ppc64 compile error
 0.6.31  2009-03-14 bump version for fedora cvs tagging mistake
 0.6.30  2009-03-14 track character set individually for each mapi element, avoid emitting bogus empty email messages into contacts and calendar files.
 0.6.29  2009-02-24 fix for 64bit on Fedora 11
--- a/configure.in	Sat Mar 14 17:23:39 2009 -0700
+++ b/configure.in	Sat Mar 14 17:45:48 2009 -0700
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(libpst,0.6.31,carl@five-ten-sg.com)
+AC_INIT(libpst,0.6.32,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([src/libpst.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
--- a/libpst.spec.in	Sat Mar 14 17:23:39 2009 -0700
+++ b/libpst.spec.in	Sat Mar 14 17:45:48 2009 -0700
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Mar 14 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.32-1
+- fix ppc64 compile error
+
 * Sat Mar 14 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.31-1
 - bump version for fedora cvs tagging mistake
 
--- a/src/libpst.c	Sat Mar 14 17:23:39 2009 -0700
+++ b/src/libpst.c	Sat Mar 14 17:45:48 2009 -0700
@@ -792,7 +792,7 @@
         memcpy(&assoc32, buf, sizeof(pst_id2_assoc32));
         LE32_CPU(assoc32.id2);
         LE32_CPU(assoc32.id);
-        LE32_CPU(assoc32.table2);
+        LE32_CPU(assoc32.child_id);
         assoc->id2      = assoc32.id2;
         assoc->id       = assoc32.id;
         assoc->child_id = assoc32.child_id;
--- a/src/pst2ldif.cpp	Sat Mar 14 17:23:39 2009 -0700
+++ b/src/pst2ldif.cpp	Sat Mar 14 17:45:48 2009 -0700
@@ -174,7 +174,8 @@
                     if (cn[0] != 0) {
                         // have a valid cn
                         pst_string ucn;
-                        ucn.str = (char*)unique_string(cn);
+                        ucn.str     = (char*)unique_string(cn);
+                        ucn.is_utf8 = 1;    // all the components are already utf8
 
                         print_ldif_dn("dn", ucn, ldap_base);
                         print_ldif_single("cn", ucn);