[Python-checkins] CVS: python/dist/src/Objects longobject.c,1.114,1.115

Martin v. L?wis loewis@users.sourceforge.net
Sat, 09 Mar 2002 04:03:01 -0800


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

Modified Files:
	longobject.c 
Log Message:
Patch #494047: removes 64-bit ?: to cope on plan9.


Index: longobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/longobject.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** longobject.c	2 Mar 2002 04:18:04 -0000	1.114
--- longobject.c	9 Mar 2002 12:02:59 -0000	1.115
***************
*** 695,699 ****
  			SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1);
  
! 	return res < 0 ? (LONG_LONG)res : bytes;
  }
  
--- 695,703 ----
  			SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 1);
  
! 	/* Plan 9 can't handle LONG_LONG in ? : expressions */
! 	if (res < 0)
! 		return (LONG_LONG)res;
! 	else
! 		return bytes;
  }
  
***************
*** 717,721 ****
  			SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0);
  
! 	return res < 0 ? (unsigned LONG_LONG)res : bytes;
  }
  
--- 721,729 ----
  			SIZEOF_LONG_LONG, IS_LITTLE_ENDIAN, 0);
  
! 	/* Plan 9 can't handle LONG_LONG in ? : expressions */
! 	if (res < 0)
! 		return (unsigned LONG_LONG)res;
! 	else
! 		return bytes;
  }