diff options
| author | Stefan Krah <skrah@bytereef.org> | 2012-11-18 23:57:20 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2012-11-18 23:57:20 (GMT) |
| commit | 8473e5740ffe15134a73f1553b5980de4ce2c619 (patch) | |
| tree | 2423ae2b904f45085e0055f508dee911a79a1945 | |
| parent | cbb3fa26469737428d33b730d15e4a840d0d6c8d (diff) | |
| parent | 5c1c83121166a56e19eaa7f577615400953d1dc1 (diff) | |
| download | cpython-8473e5740ffe15134a73f1553b5980de4ce2c619.zip cpython-8473e5740ffe15134a73f1553b5980de4ce2c619.tar.gz cpython-8473e5740ffe15134a73f1553b5980de4ce2c619.tar.bz2 | |
Merge.
| -rw-r--r-- | Python/sysmodule.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index cafbb58..92c5b67 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1349,9 +1349,6 @@ static PyStructSequence_Field flags_fields[] = { {"no_site", "-S"}, {"ignore_environment", "-E"}, {"verbose", "-v"}, -#ifdef RISCOS - {"riscos_wimp", "???"}, -#endif /* {"unbuffered", "-u"}, */ /* {"skip_first", "-x"}, */ {"bytes_warning", "-b"}, @@ -1364,11 +1361,7 @@ static PyStructSequence_Desc flags_desc = { "sys.flags", /* name */ flags__doc__, /* doc */ flags_fields, /* fields */ -#ifdef RISCOS - 13 -#else 12 -#endif }; static PyObject* @@ -1393,9 +1386,6 @@ make_flags(void) SetFlag(Py_NoSiteFlag); SetFlag(Py_IgnoreEnvironmentFlag); SetFlag(Py_VerboseFlag); -#ifdef RISCOS - SetFlag(Py_RISCOSWimpFlag); -#endif /* SetFlag(saw_unbuffered_flag); */ /* SetFlag(skipfirstline); */ SetFlag(Py_BytesWarningFlag); |