9c52986f26
This reverts commit 78c7bbc3ce.
It is no longer the case that both expat_utf8 and expat_utf16 are linked
into the same library: we only use expat_utf16 in shell Explorer
extensions, which cannot be linked into libmerged anyway.
Conflicts:
expat/expat-2.1.0.patch
Change-Id: I579c10d405d8a40cafcb2dbe09e967c6079f7b16
13 lines
538 B
Diff
13 lines
538 B
Diff
--- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000
|
|
+++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000
|
|
@@ -7,10 +7,6 @@
|
|
|
|
/* External API definitions */
|
|
|
|
-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
|
|
-#define XML_USE_MSC_EXTENSIONS 1
|
|
-#endif
|
|
-
|
|
/* Expat tries very hard to make the API boundary very specifically
|
|
defined. There are two macros defined to control this boundary;
|
|
each of these can be defined before including this header to
|