diff options
| -rw-r--r-- | spa/plugins/vulkan/vulkan-utils.c | 6 | ||||
| -rw-r--r-- | src/modules/module-rtkit.c | 8 | ||||
| -rw-r--r-- | src/pipewire/impl-node.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/spa/plugins/vulkan/vulkan-utils.c b/spa/plugins/vulkan/vulkan-utils.c index e6e00c21..7cb16b1f 100644 --- a/spa/plugins/vulkan/vulkan-utils.c +++ b/spa/plugins/vulkan/vulkan-utils.c @@ -325,7 +325,7 @@ static VkShaderModule createShaderModule(struct vulkan_state *s, const char* sha if ((fd = open(shaderFile, 0, O_RDONLY)) == -1) { spa_log_error(s->log, "can't open %s: %m", shaderFile); - return NULL; + return VK_NULL_HANDLE; } fstat(fd, &stat); @@ -344,7 +344,7 @@ static VkShaderModule createShaderModule(struct vulkan_state *s, const char* sha if (result != VK_SUCCESS) { spa_log_error(s->log, "can't create shader %s: %m", shaderFile); - return NULL; + return VK_NULL_HANDLE; } return shaderModule; } @@ -369,7 +369,7 @@ static int createComputePipeline(struct vulkan_state *s, const char *shader_file &s->pipelineLayout)); s->computeShaderModule = createShaderModule(s, shader_file); - if (s->computeShaderModule == NULL) + if (s->computeShaderModule == VK_NULL_HANDLE) return -ENOENT; VkPipelineShaderStageCreateInfo shaderStageCreateInfo = { diff --git a/src/modules/module-rtkit.c b/src/modules/module-rtkit.c index 23be7566..c6c130af 100644 --- a/src/modules/module-rtkit.c +++ b/src/modules/module-rtkit.c @@ -485,12 +485,12 @@ static void idle_func(struct spa_source *source) rttime = pw_rtkit_get_rttime_usec_max(system_bus); if (rttime >= 0) { - rl.rlim_cur = SPA_MIN(rl.rlim_cur, (long unsigned int)rttime); - rl.rlim_max = SPA_MIN(rl.rlim_max, (long unsigned int)rttime); + rl.rlim_cur = SPA_MIN(rl.rlim_cur, (rlim_t)rttime); + rl.rlim_max = SPA_MIN(rl.rlim_max, (rlim_t)rttime); } - pw_log_debug("rt.prio:%d rt.time.soft:%lu rt.time.hard:%lu", - rtprio, rl.rlim_cur, rl.rlim_max); + pw_log_debug("rt.prio:%d rt.time.soft:%"PRIi64" rt.time.hard:%"PRIi64, + rtprio, (int64_t)rl.rlim_cur, (int64_t)rl.rlim_max); if ((r = setrlimit(RLIMIT_RTTIME, &rl)) < 0) pw_log_debug("setrlimit() failed: %s", strerror(errno)); diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c index c17f5216..450eb87f 100644 --- a/src/pipewire/impl-node.c +++ b/src/pipewire/impl-node.c @@ -1283,7 +1283,7 @@ static void do_reposition(struct pw_impl_node *driver, struct pw_impl_node *node src = &node->rt.activation->reposition; dst = &a->position.segments[0]; - pw_log_trace(NAME" %p: update position:%lu", node, src->position); + pw_log_trace(NAME" %p: update position:%"PRIu64, node, src->position); dst->version = src->version; dst->flags = src->flags; |