Permalink
Browse files

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

git-svn-id: http://svn.mulberrymail.com/mulberry/Mulberry/branches/users/shared/externals/v4.1d1/CICalendar@329 a91246af-f21b-0410-bd1c-c3c7fc455132
  • Loading branch information...
1 parent 9752310 commit edcf96e5a378938a87a7b233a93797f8e45db2ea svnusers committed Mar 15, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 Makefile.in
  2. +1 −1 Source/CICalendarProperty.cpp
View
@@ -100,7 +100,7 @@ include $(JX_MAKE_INCLUDE_DIR)/jx_config
CXXDEBUG = -g
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)
include ../include/libraryrules.mak
@@ -514,7 +514,7 @@ void CICalendarProperty::Generate(std::ostream& os) const
// 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--;
}
os.write(p, bytes);

0 comments on commit edcf96e

Please sign in to comment.