Changeset 329 for Mulberry/branches/users/shared/externals/v4.1d1/CICalendar/Source/CICalendarProperty.cpp

Timestamp:

03/15/10 12:13:08 (6 months ago)

Author:

svnusers

Message:

md: merged in revisions 318..326 from Kenneth's branch, added path to XMLLib to Makefile.in for CICalendar build, reverted some of Kenneth's changes in Libraries/CICalendar

Files:

• Mulberry/branches/users/shared/externals/v4.1d1/CICalendar/Source/CICalendarProperty.cpp (modified) (1 diff)

Mulberry/branches/users/shared/externals/v4.1d1/CICalendar/Source/CICalendarProperty.cpp

@@ -515 +515 @@
                                 // Make sure we do not split in the middle of a utf-8 multi-octet sequence
                                 unsigned char* up = (unsigned char*) p;
-                                while((up[bytes] > 0x7F) and ((up[bytes] & 0xC0) == 0x80))
+                                while((up[bytes] > 0x7F) && ((up[bytes] & 0xC0) == 0x80))
                                         bytes--;
                         }