[Python-checkins] python/dist/src/Python getargs.c,2.96,2.97 modsupport.c,2.65,2.66
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Sat, 29 Mar 2003 02:04:58 -0800
Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv28047/Python
Modified Files:
getargs.c modsupport.c
Log Message:
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.96
retrieving revision 2.97
diff -C2 -d -r2.96 -r2.97
*** getargs.c 4 Feb 2003 20:55:40 -0000 2.96
--- getargs.c 29 Mar 2003 10:04:55 -0000 2.97
***************
*** 551,558 ****
#ifdef HAVE_LONG_LONG
! case 'L': {/* LONG_LONG */
! LONG_LONG *p = va_arg( *p_va, LONG_LONG * );
! LONG_LONG ival = PyLong_AsLongLong( arg );
! if( ival == (LONG_LONG)-1 && PyErr_Occurred() ) {
return converterr("long<L>", arg, msgbuf, bufsize);
} else {
--- 551,558 ----
#ifdef HAVE_LONG_LONG
! case 'L': {/* PY_LONG_LONG */
! PY_LONG_LONG *p = va_arg( *p_va, PY_LONG_LONG * );
! PY_LONG_LONG ival = PyLong_AsLongLong( arg );
! if( ival == (PY_LONG_LONG)-1 && PyErr_Occurred() ) {
return converterr("long<L>", arg, msgbuf, bufsize);
} else {
***************
*** 1321,1327 ****
#ifdef HAVE_LONG_LONG
! case 'L': /* LONG_LONG int */
{
! (void) va_arg(*p_va, LONG_LONG *);
break;
}
--- 1321,1327 ----
#ifdef HAVE_LONG_LONG
! case 'L': /* PY_LONG_LONG int */
{
! (void) va_arg(*p_va, PY_LONG_LONG *);
break;
}
Index: modsupport.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/modsupport.c,v
retrieving revision 2.65
retrieving revision 2.66
diff -C2 -d -r2.65 -r2.66
*** modsupport.c 31 Jan 2003 18:33:18 -0000 2.65
--- modsupport.c 29 Mar 2003 10:04:55 -0000 2.66
***************
*** 292,296 ****
#ifdef HAVE_LONG_LONG
case 'L':
! return PyLong_FromLongLong((LONG_LONG)va_arg(*p_va, LONG_LONG));
#endif
#ifdef Py_USING_UNICODE
--- 292,296 ----
#ifdef HAVE_LONG_LONG
case 'L':
! return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG));
#endif
#ifdef Py_USING_UNICODE