diff options
| author | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-01-18 20:36:27 +0000 |
|---|---|---|
| committer | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-01-18 20:36:27 +0000 |
| commit | ffc6107d40f73196ea3db160e51f57805adbcebc (patch) | |
| tree | 355810165fd64612b66767f871d82d87f6b48ac4 /AppPkg/Applications/Python/Python-2.7.2/Modules | |
| parent | 23b06935797ef44b4e68ad1f07eee5d3019e0269 (diff) | |
| download | edk2-platforms-ffc6107d40f73196ea3db160e51f57805adbcebc.tar.xz | |
AppPkg/Applications/Python: Add support for the pyexpat module.
Add required flags to [BuildOptions] in PythonCore.inf.
Add initialization routine to Efi/config.c.
Alter #include targets if building for UEFI in expat_external.h and xmlparse.c.
Add expat modifications to PyMod-2.7.2/Modules/expat.
Contributed-under: TianoCore Contribution Agreement 1.0
Submitted-by: Duane Voth <duanev@gmail.com>
Signed-off-by: daryl.mcdaniel@intel.com
Reviewed-by: duanev@gmail.com
Reviewed-by: daryl.mcdaniel@intel.com
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14071 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'AppPkg/Applications/Python/Python-2.7.2/Modules')
| -rw-r--r-- | AppPkg/Applications/Python/Python-2.7.2/Modules/expat/expat_external.h | 6 | ||||
| -rw-r--r-- | AppPkg/Applications/Python/Python-2.7.2/Modules/expat/xmlparse.c | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/expat_external.h b/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/expat_external.h index 5246622bf5..d71d051a69 100644 --- a/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/expat_external.h +++ b/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/expat_external.h @@ -9,7 +9,9 @@ /* Namespace external symbols to allow multiple libexpat version to
co-exist. */
-#include "pyexpatns.h"
+#if !defined(UEFI_C_SOURCE)
+ #include "pyexpatns.h"
+#endif
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
#define XML_USE_MSC_EXTENSIONS 1
@@ -101,7 +103,7 @@ typedef char XML_LChar; #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
-typedef __int64 XML_Index;
+typedef __int64 XML_Index;
typedef unsigned __int64 XML_Size;
#else
typedef long long XML_Index;
diff --git a/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/xmlparse.c b/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/xmlparse.c index cb84274d0a..87ee2ea126 100644 --- a/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/xmlparse.c +++ b/AppPkg/Applications/Python/Python-2.7.2/Modules/expat/xmlparse.c @@ -18,7 +18,11 @@ #include <string.h> /* memset(), memcpy() */
#include <assert.h>
+#if defined(UEFI_C_SOURCE)
+ #include <expat/expat.h>
+#else
#include "expat.h"
+#endif
#ifdef XML_UNICODE
#define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
@@ -1493,6 +1497,10 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal) ps_parsing = XML_FINISHED;
return result;
}
+ break;
+ default:
+ /* XML_FINISHED case required by compiler - but not tested - djv */
+ return XML_STATUS_OK;
}
}
|