[Python-checkins] cpython (merge 3.3 -> default): Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the

[christian.heimes]

http://hg.python.org/cpython/rev/b5cc822d5bf0
changeset:   86562:b5cc822d5bf0
parent:      86560:c2e018c54689
parent:      86561:4c4f31a1b706
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Oct 22 10:23:12 2013 +0200
summary:
  Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the
Python executable and not removed by the linker's optimizer.

files:
  Misc/NEWS          |  6 ++++++
  Python/pythonrun.c |  4 ++++
  2 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the
+  Python executable and not removed by the linker's optimizer.
+
 - Issue #19306: Add extra hints to the faulthandler module's stack
   dumps that these are "upside down".
 
@@ -67,6 +70,9 @@
   PyMem_Realloc().
 
 - Issue #19199: Remove ``PyThreadState.tick_counter`` field
+=======
+- Issue #19279: UTF-7 decoder no more produces illegal strings.
+>>>>>>> other
 
 - Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
   least one place so as to avoid regressions.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -116,6 +116,10 @@
 
 PyThreadState *_Py_Finalizing = NULL;
 
+/* Hack to force loading of object files */
+int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \
+    PyOS_mystrnicmp; /* Python/pystrcmp.o */
+
 /* PyModule_GetWarningsModule is no longer necessary as of 2.6
 since _warnings is builtin.  This API should not be used. */
 PyObject *

-- 
Repository URL: http://hg.python.org/cpython