EADK (StdLib, AppPkg, StdLibPrivateInternalFiles): Python Beta Release.

Clean up and clearly differentiate required and optional items in configuration files.
Enable the system command and synchronize configuration options between all CPU architectures.
Replace the UEFI_ENV macro with UEFI_C_SOURCE to align with Linux and Posix conventions.
Update copyrights and versions and make minor cosmetic enhancements to files.
Fix compiler-specific build errors.
Add Python-specific ReadMe file.

Signed-off-by: darylm503
Reviewed-by: geekboy15a
Reviewed-by: jljusten
Reviewed-by: leegrosenbaum


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13119 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 5 insertions, 5 deletions

diff --git a/AppPkg/Applications/Python/PyMod-2.7.2/Modules/selectmodule.c b/AppPkg/Applications/Python/PyMod-2.7.2/Modules/selectmodule.c
index d1fe57c145..81e5af88a7 100644
--- a/AppPkg/Applications/Python/PyMod-2.7.2/Modules/selectmodule.c
+++ b/AppPkg/Applications/Python/PyMod-2.7.2/Modules/selectmodule.c
@@ -111,7 +111,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
         v = PyObject_AsFileDescriptor( o );

         if (v == -1) goto finally;

 

-#if defined(_MSC_VER) && !defined(UEFI_ENV)

+#if defined(_MSC_VER) && !defined(UEFI_C_SOURCE)

         max = 0;                             /* not used for Win32 */

 #else  /* !_MSC_VER */

         if (v < 0 || v >= FD_SETSIZE) {

@@ -164,7 +164,7 @@ set2list(fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
     for (j = 0; fd2obj[j].sentinel >= 0; j++) {

         fd = fd2obj[j].fd;

         if (FD_ISSET(fd, set)) {

-#if !defined(_MSC_VER) || defined(UEFI_ENV)

+#if !defined(_MSC_VER) || defined(UEFI_C_SOURCE)

             if (fd > FD_SETSIZE) {

                 PyErr_SetString(PyExc_SystemError,

                "filedescriptor out of range returned in select()");

diff --git a/AppPkg/Applications/Python/PyMod-2.7.2/Modules/socketmodule.h b/AppPkg/Applications/Python/PyMod-2.7.2/Modules/socketmodule.h
index 56ee42222e..1190bfd9d1 100644
--- a/AppPkg/Applications/Python/PyMod-2.7.2/Modules/socketmodule.h
+++ b/AppPkg/Applications/Python/PyMod-2.7.2/Modules/socketmodule.h
@@ -8,7 +8,7 @@
 #   include <sys/socket.h>

 # endif

 # include <netinet/in.h>

-# if !(defined(UEFI_ENV) || defined(__BEOS__) || defined(__CYGWIN__) || (defined(PYOS_OS2) && defined(PYCC_VACPP)))

+# if !(defined(UEFI_C_SOURCE) || defined(__BEOS__) || defined(__CYGWIN__) || (defined(PYOS_OS2) && defined(PYCC_VACPP)))

 #  include <netinet/tcp.h>

 # endif

 

diff --git a/AppPkg/Applications/Python/PyMod-2.7.2/Modules/zlib/zutil.h b/AppPkg/Applications/Python/PyMod-2.7.2/Modules/zlib/zutil.h
index 9f4d1a6f9e..a202cdfa90 100644
--- a/AppPkg/Applications/Python/PyMod-2.7.2/Modules/zlib/zutil.h
+++ b/AppPkg/Applications/Python/PyMod-2.7.2/Modules/zlib/zutil.h
@@ -1,6 +1,6 @@
 /* zutil.h -- internal interface and configuration of the compression library

 

-    Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+    Copyright (c) 2011 - 2012, 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

@@ -161,7 +161,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define fdopen(fd,mode) NULL /* No fdopen() */

 #endif

 

-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined(UEFI_ENV)

+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined(UEFI_C_SOURCE)

 #  if defined(_WIN32_WCE)

 #    define fdopen(fd,mode) NULL /* No fdopen() */

 #    ifndef _PTRDIFF_T_DEFINED