*** Modules/signalmodule.c	2008-03-05 18:51:28.000000000 -0300
--- Modules/signalmodule.c.2	2008-03-05 18:49:55.000000000 -0300
*************** PySignal_SetWakeupFd(int fd)
*** 387,393 ****
  
  #ifdef HAVE_SETITIMER
  static PyObject *
! itimer_setitimer(PyObject *self, PyObject *args)
  {
      double first;
      double interval = 0;
--- 387,393 ----
  
  #ifdef HAVE_SETITIMER
  static PyObject *
! signal_setitimer(PyObject *self, PyObject *args)
  {
      double first;
      double interval = 0;
*************** Returns old values as a tuple: (delay, i
*** 421,427 ****
  
  #ifdef HAVE_GETITIMER
  static PyObject *
! itimer_getitimer(PyObject *self, PyObject *args)
  {
      int which;
      struct itimerval old;
--- 421,427 ----
  
  #ifdef HAVE_GETITIMER
  static PyObject *
! signal_getitimer(PyObject *self, PyObject *args)
  {
      int which;
      struct itimerval old;
*************** static PyMethodDef signal_methods[] = {
*** 450,459 ****
  	{"alarm",	        signal_alarm, METH_VARARGS, alarm_doc},
  #endif
  #ifdef HAVE_SETITIMER
!     {"setitimer",   itimer_setitimer,   METH_VARARGS, setitimer_doc},
  #endif
  #ifdef HAVE_GETITIMER
! 	{"getitimer",   itimer_getitimer,   METH_VARARGS, getitimer_doc},
  #endif
  	{"signal",	        signal_signal, METH_VARARGS, signal_doc},
  	{"getsignal",	        signal_getsignal, METH_VARARGS, getsignal_doc},
--- 450,459 ----
  	{"alarm",	        signal_alarm, METH_VARARGS, alarm_doc},
  #endif
  #ifdef HAVE_SETITIMER
!     {"setitimer",       signal_setitimer, METH_VARARGS, setitimer_doc},
  #endif
  #ifdef HAVE_GETITIMER
! 	{"getitimer",       signal_getitimer, METH_VARARGS, getitimer_doc},
  #endif
  	{"signal",	        signal_signal, METH_VARARGS, signal_doc},
  	{"getsignal",	        signal_getsignal, METH_VARARGS, getsignal_doc},