diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-04-07 03:17:54 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-04-07 03:17:54 (GMT) |
| commit | d218dc15e6b75d07450e4388c32e39c5741718bf (patch) | |
| tree | b2311594cb8e938b8d978f95962d448f083db7b3 /Modules | |
| parent | e9edcc401965c263820d45374eb00df7c4129b59 (diff) | |
| download | cpython-d218dc15e6b75d07450e4388c32e39c5741718bf.zip cpython-d218dc15e6b75d07450e4388c32e39c5741718bf.tar.gz cpython-d218dc15e6b75d07450e4388c32e39c5741718bf.tar.bz2 | |
Merged revisions 62177-62178,62180-62193 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62177 | skip.montanaro | 2008-04-05 21:47:47 +0200 (Sa, 05 Apr 2008) | 2 lines
Declare inittimezone static.
........
r62180 | mark.hammond | 2008-04-06 03:42:06 +0200 (So, 06 Apr 2008) | 4 lines
From issue 1753245 - better _winreg support for x64.
Adds _winreg.DisableReflectionKey, EnableReflectionKey, QueryReflectionKey,
KEY_WOW64_64KEY and KEY_WOW64_32KEY.
........
r62187 | skip.montanaro | 2008-04-06 19:05:57 +0200 (So, 06 Apr 2008) | 1 line
type
........
r62193 | trent.nelson | 2008-04-06 22:51:23 +0200 (So, 06 Apr 2008) | 1 line
Don't run kill_python as part of the build process. Change the buildbots so they have to call it explicitly instead.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/timemodule.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index bd0d063..f0edb09 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -661,7 +661,7 @@ Convert a time tuple in local time to seconds since the Epoch."); #endif /* HAVE_MKTIME */ #ifdef HAVE_WORKING_TZSET -void inittimezone(PyObject *module); +static void inittimezone(PyObject *module); static PyObject * time_tzset(PyObject *self, PyObject *unused) @@ -697,11 +697,12 @@ the local timezone used by methods such as localtime, but this behaviour\n\ should not be relied on."); #endif /* HAVE_WORKING_TZSET */ -void inittimezone(PyObject *m) { +static void +inittimezone(PyObject *m) { /* This code moved from inittime wholesale to allow calling it from time_tzset. In the future, some parts of it can be moved back (for platforms that don't HAVE_WORKING_TZSET, when we know what they - are), and the extranious calls to tzset(3) should be removed. + are), and the extraneous calls to tzset(3) should be removed. I haven't done this yet, as I don't want to change this code as little as possible when introducing the time.tzset and time.tzsetwall methods. This should simply be a method of doing the following once, |