summaryrefslogtreecommitdiff
path: root/Include/pydebug.h
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-20 21:44:56 -0500
committerBenjamin Peterson <benjamin@python.org>2012-02-20 21:44:56 -0500
commitaee9dfba4a9230f2832dd69d67e92f8e0490a163 (patch)
tree27a9896969ac7ff79dc75017cff121a077c3eb6e /Include/pydebug.h
parent34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff)
parentb19fb2462eac776746f6cb40cc84b0587c83b9bc (diff)
downloadcpython-git-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz
merge 2.6 with hash randomization fix
Diffstat (limited to 'Include/pydebug.h')
-rw-r--r--Include/pydebug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/pydebug.h b/Include/pydebug.h
index 0e7937d818..0f45960f90 100644
--- a/Include/pydebug.h
+++ b/Include/pydebug.h
@@ -26,6 +26,7 @@ PyAPI_DATA(int) Py_NoUserSiteDirectory;
PyAPI_DATA(int) _Py_QnewFlag;
/* Warn about 3.x issues */
PyAPI_DATA(int) Py_Py3kWarningFlag;
+PyAPI_DATA(int) Py_HashRandomizationFlag;
/* this is a wrapper around getenv() that pays attention to
Py_IgnoreEnvironmentFlag. It should be used for getting variables like