"time_second" is apparently a #define on MacOSX. Renamed the (static)

jackjansen · jackjansen · commit 51cd8a2d24f9 · 2002-12-17T20:57:24.000Z
routine to py_time_second.
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
@@ -3314,7 +3314,7 @@ time_minute(PyDateTime_Time *self, void *unused)
 }
 
 static PyObject *
-time_second(PyDateTime_Time *self, void *unused)
+py_time_second(PyDateTime_Time *self, void *unused)
 {
 	return PyInt_FromLong(TIME_GET_SECOND(self));
 }
@@ -3328,7 +3328,7 @@ time_microsecond(PyDateTime_Time *self, void *unused)
 static PyGetSetDef time_getset[] = {
 	{"hour",        (getter)time_hour},
 	{"minute",      (getter)time_minute},
-	{"second",      (getter)time_second},
+	{"second",      (getter)py_time_second},
 	{"microsecond", (getter)time_microsecond},
 	{NULL}
 };

Original file line number	Diff line number	Diff line change
`@@ -3314,7 +3314,7 @@ time_minute(PyDateTime_Time self, void unused)`
`3314`	`3314`	`}`
`3315`	`3315`
`3316`	`3316`	`static PyObject *`
`3317`		`-time_second(PyDateTime_Time self, void unused)`
	`3317`	`+py_time_second(PyDateTime_Time self, void unused)`
`3318`	`3318`	`{`
`3319`	`3319`	`return PyInt_FromLong(TIME_GET_SECOND(self));`
`3320`	`3320`	`}`
`@@ -3328,7 +3328,7 @@ time_microsecond(PyDateTime_Time self, void unused)`
`3328`	`3328`	`static PyGetSetDef time_getset[] = {`
`3329`	`3329`	`{"hour", (getter)time_hour},`
`3330`	`3330`	`{"minute", (getter)time_minute},`
`3331`		`- {"second", (getter)time_second},`
	`3331`	`+ {"second", (getter)py_time_second},`
`3332`	`3332`	`{"microsecond", (getter)time_microsecond},`
`3333`	`3333`	`{NULL}`
`3334`	`3334`	`};`