Merge pull request #404 from emolitor/CPP-Compatibility

Remove VLA from session.h
This commit is contained in:
Drew DeVault 2017-11-10 10:18:43 -05:00 committed by GitHub
commit 5f3b27347c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -257,7 +257,7 @@ static size_t explicit_find_gpus(struct wlr_session *session,
* If it's not found, it returns the first valid GPU it finds. * If it's not found, it returns the first valid GPU it finds.
*/ */
size_t wlr_session_find_gpus(struct wlr_session *session, size_t wlr_session_find_gpus(struct wlr_session *session,
size_t ret_len, int ret[static ret_len]) { size_t ret_len, int *ret) {
const char *explicit = getenv("WLR_DRM_DEVICES"); const char *explicit = getenv("WLR_DRM_DEVICES");
if (explicit) { if (explicit) {
return explicit_find_gpus(session, ret_len, ret, explicit); return explicit_find_gpus(session, ret_len, ret, explicit);

View File

@ -79,6 +79,6 @@ void wlr_session_signal_add(struct wlr_session *session, int fd,
bool wlr_session_change_vt(struct wlr_session *session, unsigned vt); bool wlr_session_change_vt(struct wlr_session *session, unsigned vt);
size_t wlr_session_find_gpus(struct wlr_session *session, size_t wlr_session_find_gpus(struct wlr_session *session,
size_t ret_len, int ret[static ret_len]); size_t ret_len, int *ret);
#endif #endif