Module Name: xsrc
Committed By: mrg
Date: Sat Dec 13 21:41:20 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drmMode.c
Log Message:
fix a merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/xf86drmMode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86drmMode.c
diff -u xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.7 xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.8
--- xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.7 Sat Dec 13 21:39:07 2014
+++ xsrc/external/mit/libdrm/dist/xf86drmMode.c Sat Dec 13 21:41:19 2014
@@ -806,6 +806,8 @@ int drmCheckModesettingSupported(const c
return -EINVAL;
return (modesetting ? 0 : -ENOSYS);
}
+#elif defined(__DragonFly__)
+ return 0;
#else
int fd;
static const struct drm_mode_card_res zero_res;
@@ -819,8 +821,6 @@ int drmCheckModesettingSupported(const c
drmClose(fd);
if (ret == 0)
return 0;
-#elif defined(__DragonFly__)
- return 0;
#endif
return -ENOSYS;
