Changeset 329

Timestamp:

03/15/10 12:13:08 (5 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

Location:

Mulberry/branches/users/shared/externals/v4.1d1/CICalendar

Files:

• Makefile.in (modified) (1 diff)
• Source/CICalendarProperty.cpp (modified) (1 diff)

Mulberry/branches/users/shared/externals/v4.1d1/CICalendar/Makefile.in

@@ -101 +101 @@
 CXXOPT = @CXXOPT@
 CXXWARN = @CXXWARN@
-CPPFLAGS = $(J_RAW_SYSTEM_STUFF) -include ../../Linux/Sources/Mulberry_Prefix.h -I../../Sources_Common/i18n/Charsets -I../../Linux/Includes -I../../Sources_Common -I../../Linux/Resources -I../../Sources_Common/Utilities/ -I$(JX_ROOT)/include/jcore -I$(JX_ROOT)/include/jx -I$(JX_ROOT)/include/jximage -I$(JX_ROOT)/ACE/ACE_wrappers
+CPPFLAGS = $(J_RAW_SYSTEM_STUFF) -include ../../Linux/Sources/Mulberry_Prefix.h -I../XMLLib/Source -I../../Sources_Common/i18n/Charsets -I../../Linux/Includes -I../../Sources_Common -I../../Linux/Resources -I../../Sources_Common/Utilities/ -I$(JX_ROOT)/include/jcore -I$(JX_ROOT)/include/jx -I$(JX_ROOT)/include/jximage -I$(JX_ROOT)/ACE/ACE_wrappers
 CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(CXXOPT) $(CXXDEBUG) $(CXXWARN)
 

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--;
                         }