dev-libs/libxml2/files/libxml2-2.7.2-winnt.patch - Issue 6776028: Upgrade libxml2 and its portage dependencies

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: dev-libs/libxml2/files/libxml2-2.7.2-winnt.patch

Issue 6776028: Upgrade libxml2 and its portage dependencies (Closed) Base URL: ssh://gitrw.chromium.org:9222/portage-stable.git@master

Patch Set: Created 9 years, 8 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 | « dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch ('k') | dev-libs/libxml2/files/libxml2-2.7.8-disable_static_modules.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 diff -ru -x '.Po' -x '.Plo' libxml2-2.7.2.orig/dict.c libxml2-2.7.2/dict.c

	2 --- libxml2-2.7.2.orig/dict.c 2008-11-20 11:16:34 +0100

	3 +++ libxml2-2.7.2/dict.c 2008-11-20 09:50:19 +0100

	4 @@ -25,7 +25,7 @@

	5 #else

	6 #ifdef HAVE_INTTYPES_H

	7 #include <inttypes.h>

	8 -#elif defined(WIN32)

	9 +#elif defined(WIN32) \|\| defined (__PARITY__)

	10 typedef unsigned __int32 uint32_t;

	11 #endif

	12 #endif

	13 diff -ru -x '.Po' -x '.Plo' libxml2-2.7.2.orig/include/wsockcompat.h libxml2-2 .7.2/include/wsockcompat.h

	14 --- libxml2-2.7.2.orig/include/wsockcompat.h 2008-11-20 11:16:34 +0100

	15 +++ libxml2-2.7.2/include/wsockcompat.h 2008-11-20 09:50:19 +0100

	16 @@ -26,7 +26,7 @@

	17 #endif

	18 #endif

	19

	20 -#ifdef __MINGW32__

	21 +#if defined(__MINGW32__) \|\| defined(__PARITY__)

	22 /* Include <errno.h> here to ensure that it doesn't get included later

	23 * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */

	24 #include <errno.h>

	25 diff -ru -x '.Po' -x '.Plo' libxml2-2.7.2.orig/nanohttp.c libxml2-2.7.2/nanoht tp.c

	26 --- libxml2-2.7.2.orig/nanohttp.c 2008-11-20 11:16:34 +0100

	27 +++ libxml2-2.7.2/nanohttp.c 2008-11-20 09:50:19 +0100

	28 @@ -82,6 +82,9 @@

	29 #define XML_SOCKLEN_T unsigned int

	30 #endif

	31

	32 +#ifdef __PARITY__

	33 +# include <wsockcompat.h>

	34 +#endif

	35

	36 #include <libxml/globals.h>

	37 #include <libxml/xmlerror.h>

	38 diff -ru -x '.Po' -x '.Plo' libxml2-2.7.2.orig/xmlIO.c libxml2-2.7.2/xmlIO.c

	39 --- libxml2-2.7.2.orig/xmlIO.c 2008-11-20 10:11:21 +0100

	40 +++ libxml2-2.7.2/xmlIO.c 2008-11-20 10:54:34 +0100

	41 @@ -44,6 +44,7 @@

	42 #include <winnls.h> /* for CP_UTF8 */

	43 #endif

	44

	45 +#ifndef __PARITY__

	46 /* Figure a portable way to know if a file is a directory. */

	47 #ifndef HAVE_STAT

	48 # ifdef HAVE__STAT

	49 @@ -79,6 +80,7 @@

	50 # endif

	51 # endif

	52 #endif

	53 +#endif /* __PARITY__ */

	54

	55 #include <libxml/xmlmemory.h>

	56 #include <libxml/parser.h>

	57 @@ -626,6 +628,7 @@

	58 {

	59 #ifdef HAVE_STAT

	60 int retval = -1;

	61 +#ifndef __PARITY__

	62 wchar_t *wPath;

	63

	64 wPath = __xmlIOWin32UTF8ToWChar(path);

	65 @@ -634,6 +637,7 @@

	66 retval = _wstat(wPath,info);

	67 xmlFree(wPath);

	68 }

	69 +#endif

	70 /* maybe path in native encoding */

	71 if(retval < 0)

	72 retval = stat(path,info);

OLD	NEW