merge 3.1

This commit is contained in:
Benjamin Peterson 2011-03-28 17:25:50 -05:00
commit 3077404de4
1 changed files with 3 additions and 3 deletions

View File

@ -42,9 +42,9 @@
const char *
Py_GetBuildInfo(void)
{
static char buildinfo[50 + sizeof HGVERSION +
((sizeof HGTAG > sizeof HGBRANCH) ?
sizeof HGTAG : sizeof HGBRANCH)];
static char buildinfo[50 + sizeof(HGVERSION) +
((sizeof(HGTAG) > sizeof(HGBRANCH)) ?
sizeof(HGTAG) : sizeof(HGBRANCH))];
const char *revision = _Py_hgversion();
const char *sep = *revision ? ":" : "";
const char *hgid = _Py_hgidentifier();