Skip to content

Commit 5d67b9d

Browse files
committed
buffer: Remove use of major()/minor()
These are in different headers on FreeBSD, so a more portable way of checking is to compare dev_t directly against zero.
1 parent cb53a38 commit 5d67b9d

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/buffer.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include <gbm.h>
4141
#include <sys/ioctl.h>
4242
#include <fcntl.h>
43-
#include <sys/sysmacros.h>
4443
#include <xf86drm.h>
4544

4645
#ifdef HAVE_LINUX_DMA_HEAP
@@ -497,7 +496,7 @@ static int find_render_node(char *node, size_t maxlen) {
497496
static void open_render_node(struct wv_buffer_pool* pool)
498497
{
499498
char path[256];
500-
if (major(pool->config.node) != 0 || minor(pool->config.node) != 0) {
499+
if (pool->config.node) {
501500
if (render_node_from_dev_t(path, sizeof(path),
502501
pool->config.node) < 0) {
503502
nvnc_log(NVNC_LOG_ERROR, "Could not find render node from dev_t");
@@ -546,8 +545,7 @@ void wv_buffer_pool_reconfig(struct wv_buffer_pool* pool,
546545
open_render_node(pool);
547546
}
548547

549-
if (major(pool->config.node) == 0 && minor(pool->config.node) == 0 &&
550-
!pool->gbm)
548+
if (!pool->config.node && !pool->gbm)
551549
open_render_node(pool);
552550

553551
assert(pool->gbm);

0 commit comments

Comments
 (0)