Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: third_party/libxml/google.patch

Issue 4027: Roll the icu38 revision in the DEPS file to change the name of... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/net.sln ('k') | third_party/libxml/win32/Makefile » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Index: encoding.c 1 Index: encoding.c
2 =================================================================== 2 ===================================================================
3 --- encoding.c (revision 3733) 3 --- encoding.c (revision 3733)
4 +++ encoding.c (working copy) 4 +++ encoding.c (working copy)
5 @@ -58,7 +58,7 @@ 5 @@ -58,7 +58,7 @@
6 static int xmlCharEncodingAliasesNb = 0; 6 static int xmlCharEncodingAliasesNb = 0;
7 static int xmlCharEncodingAliasesMax = 0; 7 static int xmlCharEncodingAliasesMax = 0;
8 8
9 -#ifdef LIBXML_ICONV_ENABLED 9 -#ifdef LIBXML_ICONV_ENABLED
10 +#if defined(LIBXML_ICONV_ENABLED) || defined(LIBXML_ICU_ENABLED) 10 +#if defined(LIBXML_ICONV_ENABLED) || defined(LIBXML_ICU_ENABLED)
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 xmlDetectSAX2(ctxt); 487 xmlDetectSAX2(ctxt);
488 Index: win32/Makefile.msvc 488 Index: win32/Makefile.msvc
489 =================================================================== 489 ===================================================================
490 --- win32/Makefile.msvc (revision 3733) 490 --- win32/Makefile.msvc (revision 3733)
491 +++ win32/Makefile.msvc (working copy) 491 +++ win32/Makefile.msvc (working copy)
492 @@ -71,6 +71,9 @@ 492 @@ -71,6 +71,9 @@
493 !if "$(WITH_ICONV)" == "1" 493 !if "$(WITH_ICONV)" == "1"
494 LIBS = $(LIBS) iconv.lib 494 LIBS = $(LIBS) iconv.lib
495 !endif 495 !endif
496 ++!if "$(WITH_ICU)" == "1" 496 ++!if "$(WITH_ICU)" == "1"
497 ++LIBS = $(LIBS) icuuc.lib 497 ++LIBS = $(LIBS) icu.lib
jungshik at Google 2008/09/23 01:31:26 This change is a bit tricky when sending the patch
498 ++!endif 498 ++!endif
499 !if "$(WITH_ZLIB)" == "1" 499 !if "$(WITH_ZLIB)" == "1"
500 LIBS = $(LIBS) zdll.lib 500 LIBS = $(LIBS) zdll.lib
501 !endif 501 !endif
502 Index: win32/configure.js 502 Index: win32/configure.js
503 =================================================================== 503 ===================================================================
504 --- win32/configure.js (revision 3733) 504 --- win32/configure.js (revision 3733)
505 +++ win32/configure.js (working copy) 505 +++ win32/configure.js (working copy)
506 @@ -40,6 +40,7 @@ 506 @@ -40,6 +40,7 @@
507 var withXptr = true; 507 var withXptr = true;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 +++ xmlregexp.c (working copy) 587 +++ xmlregexp.c (working copy)
588 @@ -6464,7 +6464,7 @@ 588 @@ -6464,7 +6464,7 @@
589 if (name != NULL) { 589 if (name != NULL) {
590 value += 30 * (*name); 590 value += 30 * (*name);
591 while ((ch = *name++) != 0) { 591 while ((ch = *name++) != 0) {
592 - value = value ^ ((value << 5) + (value >> 3) + (unsigned long)ch); 592 - value = value ^ ((value << 5) + (value >> 3) + (unsigned long)ch);
593 + value = value ^ ((value << 5) + (value >> 3) + (unsigned short)ch); 593 + value = value ^ ((value << 5) + (value >> 3) + (unsigned short)ch);
594 } 594 }
595 } 595 }
596 return (value); 596 return (value);
OLDNEW
« no previous file with comments | « net/net.sln ('k') | third_party/libxml/win32/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698