summaryrefslogtreecommitdiffstats
path: root/Include/pydebug.h
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-05-06 23:45:46 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-05-06 23:45:46 (GMT)
commit8dc226fccd2183670ac19a85b89941f5b05167dc (patch)
treea02b3f53c54d1e18139d53de40954828350fabcb /Include/pydebug.h
parent1bf7108fd515af1b537dcbf738c3cb488af5ab0d (diff)
downloadcpython-8dc226fccd2183670ac19a85b89941f5b05167dc.zip
cpython-8dc226fccd2183670ac19a85b89941f5b05167dc.tar.gz
cpython-8dc226fccd2183670ac19a85b89941f5b05167dc.tar.bz2
Merged revisions 62774-62775,62785,62787-62788 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62774 | georg.brandl | 2008-05-06 19:11:42 +0200 (Tue, 06 May 2008) | 2 lines #2773: fix description of 'g' and 'G' formatting spec. ........ r62775 | georg.brandl | 2008-05-06 19:20:54 +0200 (Tue, 06 May 2008) | 2 lines > != (!<). ........ r62785 | benjamin.peterson | 2008-05-07 00:18:11 +0200 (Wed, 07 May 2008) | 2 lines Fix logic error in Python/_warnings.c and add a test to verify ........ r62787 | benjamin.peterson | 2008-05-07 00:31:52 +0200 (Wed, 07 May 2008) | 2 lines Make the Python implementation of warnings compatible with the C implementation regarding non-callable showwarning ........ r62788 | christian.heimes | 2008-05-07 00:41:46 +0200 (Wed, 07 May 2008) | 1 line Implemented PEP 370 ........
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 279e360..9d18ab4 100644
--- a/Include/pydebug.h
+++ b/Include/pydebug.h
@@ -18,6 +18,7 @@ PyAPI_DATA(int) Py_TabcheckFlag;
PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
PyAPI_DATA(int) Py_DivisionWarningFlag;
PyAPI_DATA(int) Py_DontWriteBytecodeFlag;
+PyAPI_DATA(int) Py_NoUserSiteDirectory;
/* this is a wrapper around getenv() that pays attention to
Py_IgnoreEnvironmentFlag. It should be used for getting variables like