diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-06 17:46:49 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-06 17:46:49 (GMT) |
| commit | af580dff4af3cb812cdd7a229a4a65059b3bc1ee (patch) | |
| tree | 69954d6e499793f75edc045e31ade0e0eabb6053 /Include | |
| parent | 45c7514de406d9ed84e46d80500fb4ac87a94ea8 (diff) | |
| download | cpython-af580dff4af3cb812cdd7a229a4a65059b3bc1ee.zip cpython-af580dff4af3cb812cdd7a229a4a65059b3bc1ee.tar.gz cpython-af580dff4af3cb812cdd7a229a4a65059b3bc1ee.tar.bz2 | |
replace PY_LONG_LONG with long long
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/longobject.h | 12 | ||||
| -rw-r--r-- | Include/pyport.h | 4 | ||||
| -rw-r--r-- | Include/pythread.h | 2 | ||||
| -rw-r--r-- | Include/pytime.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Include/longobject.h b/Include/longobject.h index 6237001..2957f16 100644 --- a/Include/longobject.h +++ b/Include/longobject.h @@ -85,12 +85,12 @@ PyAPI_FUNC(double) PyLong_AsDouble(PyObject *); PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *); PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *); -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 *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *); +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 *); +PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLongMask(PyObject *); +PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *); PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int); #ifndef Py_LIMITED_API diff --git a/Include/pyport.h b/Include/pyport.h index b9aa70b..3d5233e 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -156,8 +156,8 @@ typedef unsigned long Py_uintptr_t; typedef long Py_intptr_t; #elif SIZEOF_VOID_P <= SIZEOF_LONG_LONG -typedef unsigned PY_LONG_LONG Py_uintptr_t; -typedef PY_LONG_LONG Py_intptr_t; +typedef unsigned long long Py_uintptr_t; +typedef long long Py_intptr_t; #else # error "Python needs a typedef for Py_uintptr_t in pyport.h." diff --git a/Include/pythread.h b/Include/pythread.h index 6f3d08d..459a5d5 100644 --- a/Include/pythread.h +++ b/Include/pythread.h @@ -37,7 +37,7 @@ PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); module exposes a higher-level API, with timeouts expressed in seconds and floating-point numbers allowed. */ -#define PY_TIMEOUT_T PY_LONG_LONG +#define PY_TIMEOUT_T long long #define PY_TIMEOUT_MAX PY_LLONG_MAX /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */ diff --git a/Include/pytime.h b/Include/pytime.h index 98612e1..859321b 100644 --- a/Include/pytime.h +++ b/Include/pytime.h @@ -78,7 +78,7 @@ PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds); ((_PyTime_t)(seconds) * (1000 * 1000 * 1000)) /* Create a timestamp from a number of nanoseconds. */ -PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(PY_LONG_LONG ns); +PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(long long ns); /* Convert a number of seconds (Python float or int) to a timetamp. Raise an exception and return -1 on error, return 0 on success. */ |