diff options
| author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-04-29 09:17:07 +0200 |
|---|---|---|
| committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-04-29 09:17:07 +0200 |
| commit | 80672df530bff762047134c58c061e83ba082487 (patch) | |
| tree | c18b977c62b98ac154d67927a0d2e8bc56fe5358 /src/keeper.c | |
| parent | 28c7e6b487242f76cc4a945cc462612f90caee7e (diff) | |
| download | lanes-80672df530bff762047134c58c061e83ba082487.tar.gz lanes-80672df530bff762047134c58c061e83ba082487.tar.bz2 lanes-80672df530bff762047134c58c061e83ba082487.zip | |
remove uintptr_t againv3.17.0
Diffstat (limited to 'src/keeper.c')
| -rw-r--r-- | src/keeper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keeper.c b/src/keeper.c index 1522718..2a966ef 100644 --- a/src/keeper.c +++ b/src/keeper.c | |||
| @@ -189,7 +189,7 @@ static void push_table( lua_State* L, int idx_) | |||
| 189 | STACK_END( L, 1); | 189 | STACK_END( L, 1); |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | int keeper_push_linda_storage( Universe* U, lua_State* L, void* ptr_, uintptr_t magic_) | 192 | int keeper_push_linda_storage(Universe* U, lua_State* L, void* ptr_, uint_t magic_) |
| 193 | { | 193 | { |
| 194 | Keeper* const K = which_keeper( U->keepers, magic_); | 194 | Keeper* const K = which_keeper( U->keepers, magic_); |
| 195 | lua_State* const KL = K ? K->L : NULL; | 195 | lua_State* const KL = K ? K->L : NULL; |
| @@ -731,7 +731,7 @@ void init_keepers( Universe* U, lua_State* L) | |||
| 731 | } | 731 | } |
| 732 | 732 | ||
| 733 | // should be called only when inside a keeper_acquire/keeper_release pair (see linda_protected_call) | 733 | // should be called only when inside a keeper_acquire/keeper_release pair (see linda_protected_call) |
| 734 | Keeper* which_keeper(Keepers* keepers_, uintptr_t magic_) | 734 | Keeper* which_keeper(Keepers* keepers_, uint_t magic_) |
| 735 | { | 735 | { |
| 736 | int const nbKeepers = keepers_->nb_keepers; | 736 | int const nbKeepers = keepers_->nb_keepers; |
| 737 | if (nbKeepers) | 737 | if (nbKeepers) |
| @@ -742,7 +742,7 @@ Keeper* which_keeper(Keepers* keepers_, uintptr_t magic_) | |||
| 742 | return NULL; | 742 | return NULL; |
| 743 | } | 743 | } |
| 744 | 744 | ||
| 745 | Keeper* keeper_acquire( Keepers* keepers_, uintptr_t magic_) | 745 | Keeper* keeper_acquire(Keepers* keepers_, uint_t magic_) |
| 746 | { | 746 | { |
| 747 | int const nbKeepers = keepers_->nb_keepers; | 747 | int const nbKeepers = keepers_->nb_keepers; |
| 748 | // can be 0 if this happens during main state shutdown (lanes is being GC'ed -> no keepers) | 748 | // can be 0 if this happens during main state shutdown (lanes is being GC'ed -> no keepers) |
| @@ -755,7 +755,7 @@ Keeper* keeper_acquire( Keepers* keepers_, uintptr_t magic_) | |||
| 755 | * Pointers are often aligned by 8 or so - ignore the low order bits | 755 | * Pointers are often aligned by 8 or so - ignore the low order bits |
| 756 | * have to cast to unsigned long to avoid compilation warnings about loss of data when converting pointer-to-integer | 756 | * have to cast to unsigned long to avoid compilation warnings about loss of data when converting pointer-to-integer |
| 757 | */ | 757 | */ |
| 758 | unsigned int i = (unsigned int)((magic_ >> KEEPER_MAGIC_SHIFT) % nbKeepers); | 758 | uint_t i = (uint_t) ((magic_ >> KEEPER_MAGIC_SHIFT) % nbKeepers); |
| 759 | Keeper* K = &keepers_->keeper_array[i]; | 759 | Keeper* K = &keepers_->keeper_array[i]; |
| 760 | 760 | ||
| 761 | MUTEX_LOCK( &K->keeper_cs); | 761 | MUTEX_LOCK( &K->keeper_cs); |