Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-40302: Replace PY_INT64_T with int64_t #19573

Merged
merged 1 commit into from Apr 17, 2020
Merged

bpo-40302: Replace PY_INT64_T with int64_t #19573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/c-api/init.rst
View file
Open in desktop
Expand Up @@ -1114,7 +1114,7 @@ All of the following functions must be called after :c:func:`Py_Initialize`.
.. versionadded:: 3.9


.. c:function:: PY_INT64_T PyInterpreterState_GetID(PyInterpreterState *interp)
.. c:function:: int64_t PyInterpreterState_GetID(PyInterpreterState *interp)

Return the interpreter's unique ID. If there was any error in doing
so then ``-1`` is returned and an error is set.
Expand Down
2 changes: 1 addition & 1 deletion Include/internal/pycore_interp.h
View file
Open in desktop
Expand Up @@ -170,7 +170,7 @@ struct _xidregitem {
struct _xidregitem *next;
};

PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(PY_INT64_T);
PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(int64_t);

PyAPI_FUNC(int) _PyInterpreterState_IDInitref(struct _is *);
PyAPI_FUNC(void) _PyInterpreterState_IDIncref(struct _is *);
Expand Down
12 changes: 6 additions & 6 deletions Modules/_randommodule.c
View file
Open in desktop
Expand Up @@ -234,7 +234,7 @@ init_by_array(RandomObject *self, uint32_t init_key[], size_t key_length)
static int
random_seed_urandom(RandomObject *self)
{
PY_UINT32_T key[N];
uint32_t key[N];

if (_PyOS_URandomNonblock(key, sizeof(key)) < 0) {
return -1;
Expand All @@ -250,14 +250,14 @@ random_seed_time_pid(RandomObject *self)
uint32_t key[5];

now = _PyTime_GetSystemClock();
key[0] = (PY_UINT32_T)(now & 0xffffffffU);
key[1] = (PY_UINT32_T)(now >> 32);
key[0] = (uint32_t)(now & 0xffffffffU);
key[1] = (uint32_t)(now >> 32);

key[2] = (PY_UINT32_T)getpid();
key[2] = (uint32_t)getpid();

now = _PyTime_GetMonotonicClock();
key[3] = (PY_UINT32_T)(now & 0xffffffffU);
key[4] = (PY_UINT32_T)(now >> 32);
key[3] = (uint32_t)(now & 0xffffffffU);
key[4] = (uint32_t)(now >> 32);

init_by_array(self, key, Py_ARRAY_LENGTH(key));
}
Expand Down
6 changes: 3 additions & 3 deletions Modules/_sha3/sha3module.c
View file
Open in desktop
Expand Up @@ -40,17 +40,17 @@
#elif PY_BIG_ENDIAN
/* opt64 is not yet supported on big endian platforms */
#define KeccakOpt 32
#elif SIZEOF_VOID_P == 8 && defined(PY_UINT64_T)
#elif SIZEOF_VOID_P == 8
/* opt64 works only on little-endian 64bit platforms with unsigned int64 */
#define KeccakOpt 64
#else
/* opt32 is used for the remaining 32 and 64bit platforms */
#define KeccakOpt 32
#endif

#if KeccakOpt == 64 && defined(PY_UINT64_T)
#if KeccakOpt == 64
/* 64bit platforms with unsigned int64 */
typedef PY_UINT64_T UINT64;
typedef uint64_t UINT64;
typedef unsigned char UINT8;
#endif

Expand Down
2 changes: 1 addition & 1 deletion Modules/_xxsubinterpretersmodule.c
View file
Open in desktop
Expand Up @@ -2135,7 +2135,7 @@ static PyObject *
interp_get_main(PyObject *self, PyObject *Py_UNUSED(ignored))
{
// Currently, 0 is always the main interpreter.
PY_INT64_T id = 0;
int64_t id = 0;
return _PyInterpreterID_New(id);
}

Expand Down
2 changes: 1 addition & 1 deletion Objects/interpreteridobject.c
View file
Open in desktop
Expand Up @@ -270,7 +270,7 @@ _PyInterpreterState_GetIDObject(PyInterpreterState *interp)
if (_PyInterpreterState_IDInitref(interp) != 0) {
return NULL;
};
PY_INT64_T id = PyInterpreterState_GetID(interp);
int64_t id = PyInterpreterState_GetID(interp);
if (id < 0) {
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions Python/pystate.c
View file
Open in desktop
Expand Up @@ -452,11 +452,11 @@ PyInterpreterState_GetID(PyInterpreterState *interp)


static PyInterpreterState *
interp_look_up_id(_PyRuntimeState *runtime, PY_INT64_T requested_id)
interp_look_up_id(_PyRuntimeState *runtime, int64_t requested_id)
{
PyInterpreterState *interp = runtime->interpreters.head;
while (interp != NULL) {
PY_INT64_T id = PyInterpreterState_GetID(interp);
int64_t id = PyInterpreterState_GetID(interp);
if (id < 0) {
return NULL;
}
Expand All @@ -469,7 +469,7 @@ interp_look_up_id(_PyRuntimeState *runtime, PY_INT64_T requested_id)
}

PyInterpreterState *
_PyInterpreterState_LookUpID(PY_INT64_T requested_id)
_PyInterpreterState_LookUpID(int64_t requested_id)
{
PyInterpreterState *interp = NULL;
if (requested_id >= 0) {
Expand Down