[Python-checkins] CVS: python/dist/src/Modules _cursesmodule.c,2.61.6.1,2.61.6.2

Michael Hudson mwh@users.sourceforge.net
Sun, 17 Mar 2002 11:02:13 -0800


Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv30087

Modified Files:
      Tag: release22-maint
	_cursesmodule.c 
Log Message:
Backport my fix from a whiles back:

Fix for

[ #504284 ] Last build problems on AIX

I'm ignoring the suggestion that this should be an autoconf test in the
interests of having a fix today.  Feel free to quibble.




Index: _cursesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_cursesmodule.c,v
retrieving revision 2.61.6.1
retrieving revision 2.61.6.2
diff -C2 -d -r2.61.6.1 -r2.61.6.2
*** _cursesmodule.c	6 Feb 2002 17:11:51 -0000	2.61.6.1
--- _cursesmodule.c	17 Mar 2002 19:02:10 -0000	2.61.6.2
***************
*** 2311,2322 ****
  	}
  	
! #ifdef __hpux
!         /* tparm is declared with 10 arguments on HP/UX 11.
!            If this is a problem on other platforms as well,
!            an autoconf test should be added to determine
!            whether tparm can be called with a variable number
!            of arguments. Perhaps the other arguments should
!            be initialized in this case also. */
!         result = tparm(fmt,i1,i2,i3,i4,i5,i6,i7,i8,i9);
  #else
  	switch (PyTuple_GET_SIZE(args)) {
--- 2311,2322 ----
  	}
  	
! #if defined(__hpux) || defined(_AIX)
! 	/* tparm is declared with 10 arguments on a few platforms
! 	   (HP-UX, AIX). If this proves to be a problem on other 
! 	   platforms as well, perhaps an autoconf test should be 
! 	   added to determine whether tparm can be called with a 
! 	   variable number of arguments. Perhaps the other arguments 
! 	   should be initialized in this case also. */
! 	result = tparm(fmt,i1,i2,i3,i4,i5,i6,i7,i8,i9);
  #else
  	switch (PyTuple_GET_SIZE(args)) {
***************
*** 2352,2356 ****
  		break;
  	}
! #endif /* __hpux */
  	return PyString_FromString(result);
  }
--- 2352,2356 ----
  		break;
  	}
! #endif /* defined(__hpux) || defined(_AIX) */
  	return PyString_FromString(result);
  }