diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-02-11 11:35:31 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-02-11 11:35:31 +0000 |
| commit | 28b2f35672072e9f8261b2ad178d269990291863 (patch) | |
| tree | 41c23f295f384fbc2cf15e11f7b5a7f04635ea30 /lib | |
| parent | 9f70b4bd8a4a8f166facc45006a22ca010cf3974 (diff) | |
fix merge error
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libdrm/xf86drm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libdrm/xf86drm.c b/lib/libdrm/xf86drm.c index 362a008af..f6910c8c3 100644 --- a/lib/libdrm/xf86drm.c +++ b/lib/libdrm/xf86drm.c @@ -395,7 +395,8 @@ static int drmOpenDevice(dev_t dev, int minor, int type) devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); } -#if !UDEV && !defined(__OpenBSD__) +#ifndef __OpenBSD__ +#if !UDEV if (stat(DRM_DIR_NAME, &st)) { if (!isroot) return DRM_ERR_NOT_ROOT; @@ -441,6 +442,7 @@ wait_for_udev: } } #endif +#endif /* __OpenBSD__ */ #ifndef X_PRIVSEP fd = open(buf, O_RDWR | O_CLOEXEC, 0); |