[Python-checkins] python/dist/src/Include longobject.h,2.28,2.29 pyport.h,2.59,2.60

loewis@users.sourceforge.net loewis@users.sourceforge.net
Sat, 29 Mar 2003 02:04:56 -0800


Update of /cvsroot/python/python/dist/src/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv28047/Include

Modified Files:
	longobject.h pyport.h 
Log Message:
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.


Index: longobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/longobject.h,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -d -r2.28 -r2.29
*** longobject.h	31 Jan 2003 15:52:03 -0000	2.28
--- longobject.h	29 Mar 2003 10:04:54 -0000	2.29
***************
*** 34,41 ****
  
  #ifdef HAVE_LONG_LONG
! PyAPI_FUNC(PyObject *) PyLong_FromLongLong(LONG_LONG);
! PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned LONG_LONG);
! PyAPI_FUNC(LONG_LONG) PyLong_AsLongLong(PyObject *);
! PyAPI_FUNC(unsigned LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *);
  #endif /* HAVE_LONG_LONG */
  
--- 34,41 ----
  
  #ifdef HAVE_LONG_LONG
! PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG);
! PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG);
! PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *);
! PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *);
  #endif /* HAVE_LONG_LONG */
  

Index: pyport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v
retrieving revision 2.59
retrieving revision 2.60
diff -C2 -d -r2.59 -r2.60
*** pyport.h	10 Feb 2003 19:36:46 -0000	2.59
--- pyport.h	29 Mar 2003 10:04:54 -0000	2.60
***************
*** 28,32 ****
  HAVE_LONG_LONG
  Meaning:  The compiler supports the C type "long long"
! Used in:  LONG_LONG
  
  **************************************************************************/
--- 28,32 ----
  HAVE_LONG_LONG
  Meaning:  The compiler supports the C type "long long"
! Used in:  PY_LONG_LONG
  
  **************************************************************************/
***************
*** 56,61 ****
  
  #ifdef HAVE_LONG_LONG
! #ifndef LONG_LONG
! #define LONG_LONG long long
  #endif
  #endif /* HAVE_LONG_LONG */
--- 56,61 ----
  
  #ifdef HAVE_LONG_LONG
! #ifndef PY_LONG_LONG
! #define PY_LONG_LONG long long
  #endif
  #endif /* HAVE_LONG_LONG */
***************
*** 79,84 ****
  
  #elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG)
! typedef unsigned LONG_LONG	Py_uintptr_t;
! typedef LONG_LONG		Py_intptr_t;
  
  #else
--- 79,84 ----
  
  #elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG)
! typedef unsigned PY_LONG_LONG	Py_uintptr_t;
! typedef PY_LONG_LONG		Py_intptr_t;
  
  #else