diff options
| author | Daryl McDaniel <edk2-lists@mc2research.org> | 2015-12-23 00:15:45 +0000 |
|---|---|---|
| committer | darylm503 <darylm503@Edk2> | 2015-12-23 00:15:45 +0000 |
| commit | d11973f1cae1d8e25017b09734fbf419342b192a (patch) | |
| tree | fcbb2f3bcee995a798858ca00fab3c07b5499a45 /AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h | |
| parent | 5285ac3eba73d3f6ad8cf356a0a8815fe97b3cf3 (diff) | |
| download | edk2-platforms-d11973f1cae1d8e25017b09734fbf419342b192a.tar.xz | |
AppPkg/.../Python-2.7.10: AppPkg.dsc, pyconfig.h, PyMod-2.7.10
Apply UEFI-specific changes to files to make them equivalent to the Python 2.7.2 versions.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daryl McDaniel <edk2-lists@mc2research.org>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
---
AppPkg/AppPkg.dsc | 5 +-
.../Python/Python-2.7.10/Ia32/pyconfig.h | 93 ++++++++----
.../Python-2.7.10/PyMod-2.7.10/Lib/ntpath.py | 30 +++-
.../Python/Python-2.7.10/PyMod-2.7.10/Lib/os.py | 35 ++++-
.../Python/Python-2.7.10/PyMod-2.7.10/Lib/pydoc.py | 17 +++
.../Python/Python-2.7.10/PyMod-2.7.10/Lib/site.py | 165 ++++++---------------
.../Python-2.7.10/PyMod-2.7.10/Modules/_sre.c | 150 ++++++++++---------
.../Python-2.7.10/PyMod-2.7.10/Modules/addrinfo.h | 101 +++++++------
.../PyMod-2.7.10/Modules/errnomodule.c | 57 ++++++-
.../PyMod-2.7.10/Modules/expat/expat_external.h | 4 +-
.../Python-2.7.10/PyMod-2.7.10/Modules/getpath.c | 143 +++++-------------
.../Python-2.7.10/PyMod-2.7.10/Modules/main.c | 61 ++++----
.../PyMod-2.7.10/Modules/selectmodule.c | 43 ++++--
.../PyMod-2.7.10/Modules/zlib/gzguts.h | 10 +-
.../PyMod-2.7.10/Modules/zlib/zutil.h | 11 +-
.../PyMod-2.7.10/Objects/longobject.c | 14 +-
.../PyMod-2.7.10/Objects/stringlib/localeutil.h | 17 ++-
.../PyMod-2.7.10/Python/getcopyright.c | 24 ++-
.../Python-2.7.10/PyMod-2.7.10/Python/marshal.c | 21 ++-
.../Python-2.7.10/PyMod-2.7.10/Python/random.c | 32 +++-
.../Python/Python-2.7.10/X64/pyconfig.h | 63 ++++++--
21 files changed, 640 insertions(+), 456 deletions(-)
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19462 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h')
| -rw-r--r-- | AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h b/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h index 3ab7f55962..45c980c6a8 100644 --- a/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h +++ b/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Objects/stringlib/localeutil.h @@ -1,10 +1,25 @@ -/* stringlib: locale related helpers implementation */
+/** @file
+ stringlib: locale related helpers implementation.
+
+ Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials are licensed and made available under
+ the terms and conditions of the BSD License that accompanies this distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
#ifndef STRINGLIB_LOCALEUTIL_H
#define STRINGLIB_LOCALEUTIL_H
#include <locale.h>
+// Prevent conflicts with EFI
+#undef MAX
+#undef MIN
+
#define MAX(x, y) ((x) < (y) ? (y) : (x))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|