We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix for SDL_UDEV_DYNAMIC/SDL_UDEV_LIBS

udev_fix.diff (text/plain), 1.42 KB, created by Ethan Lee on 2017-10-11 00:24:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ethan Lee

Created: 2017-10-11 00:24:07 UTC

Size: 1.42 KB

patch

obsolete

># HG changeset patch
># User Ethan Lee <flibitijibibo@flibitijibibo.com>
># Date 1507681335 14400
>#      Tue Oct 10 20:22:15 2017 -0400
># Node ID 89a8440a026397a2105f3a8c19daa20158959da7
># Parent  c48ab2c208a2682233411236b205fa2fcd1eae39
>Check SDL_UDEV_DYNAMIC first, then SDL_UDEV_LIBS separately
>
>diff -r c48ab2c208a2 -r 89a8440a0263 src/core/linux/SDL_udev.c
>--- a/src/core/linux/SDL_udev.c	Tue Oct 10 16:12:56 2017 -0400
>+++ b/src/core/linux/SDL_udev.c	Tue Oct 10 20:22:15 2017 -0400
>@@ -36,14 +36,7 @@
> #include "SDL_timer.h"
> #include "../unix/SDL_poll.h"
> 
>-static const char *SDL_UDEV_LIBS[] = {
>-#ifdef SDL_UDEV_DYNAMIC
>-	SDL_UDEV_DYNAMIC
>-#else
>-	"libudev.so.1",
>-	"libudev.so.0"
>-#endif
>-};
>+static const char *SDL_UDEV_LIBS[] = { "libudev.so.1", "libudev.so.0" };
> 
> #define _THIS SDL_UDEV_PrivateData *_this
> static _THIS = NULL;
>@@ -261,6 +254,19 @@
>         return 0;
>     }
> 
>+#ifdef SDL_UDEV_DYNAMIC
>+    /* Check for the build environment's libudev first */
>+    if (_this->udev_handle == NULL) {
>+        _this->udev_handle = SDL_LoadObject(SDL_UDEV_DYNAMIC);
>+        if (_this->udev_handle != NULL) {
>+            retval = SDL_UDEV_load_syms();
>+            if (retval < 0) {
>+                SDL_UDEV_UnloadLibrary();
>+            }
>+        }
>+    }
>+#endif
>+
>     if (_this->udev_handle == NULL) {
>         for( i = 0 ; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
>             _this->udev_handle = SDL_LoadObject(SDL_UDEV_LIBS[i]);

Actions: View | Diff

Attachments on bug 3869: 2972

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.