Skip to content

Commit 5fbc2e4

Browse files
luke-cliftonluke-clifton
committed
Also search for dylibs in case we are on Darwin
1 parent fced94e commit 5fbc2e4

22 files changed

+22
-23
lines changed

‎src/dpms.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use super::xmd::{BOOL, CARD16};
1111
// functions
1212
//
1313

14-
x11_link! { Xext, xext, ["libXext.so.6", "libXext.so"], 9,
14+
x11_link! { Xext, xext, ["libXext.so.6", "libXext.so", "libXext.6.dylib", "libXext.dylib"], 9,
1515
pub fn DPMSQueryExtension (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Bool,
1616
pub fn DPMSGetVersion (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Status,
1717
pub fn DPMSCapable (_1: *mut Display) -> Bool,

‎src/glx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::xlib::{Display, XVisualInfo, XID};
1010
// functions
1111
//
1212

13-
x11_link! { Glx, gl, ["libGL.so.1", "libGL.so"], 40,
13+
x11_link! { Glx, gl, ["libGL.so.1", "libGL.so", "libGL.1.dylib", "libGL.dylib"], 40,
1414
pub fn glXChooseFBConfig (_4: *mut Display, _3: c_int, _2: *const c_int, _1: *mut c_int) -> *mut GLXFBConfig,
1515
pub fn glXChooseVisual (_3: *mut Display, _2: c_int, _1: *mut c_int) -> *mut XVisualInfo,
1616
pub fn glXCopyContext (_4: *mut Display, _3: GLXContext, _2: GLXContext, _1: c_ulong) -> (),

‎src/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::xlib::{Bool, Display, Drawable, Status, Time, XID};
1010
// functions
1111
//
1212

13-
x11_link! { Xext, xext, ["libXext.so.6", "libXext.so"], 38,
13+
x11_link! { Xext, xext, ["libXext.so.6", "libXext.so", "libXext.6.dylib", "libXext.dylib"], 38,
1414
pub fn XSyncQueryExtension(dpy: *mut Display, event_base: *mut c_int, error_base: *mut c_int) -> Status,
1515
pub fn XSyncInitialize(dpy: *mut Display, major_version: *mut c_int, minor_version: *mut c_int) -> Status,
1616
pub fn XSyncListSystemCounters(dpy: *mut Display, n_counters: *mut c_int) -> *mut XSyncSystemCounter,

‎src/xcursor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::xlib::{Cursor, Display, XColor, XImage};
1111
// functions
1212
//
1313

14-
x11_link! { Xcursor, xcursor, ["libXcursor.so.1", "libXcursor.so"], 59,
14+
x11_link! { Xcursor, xcursor, ["libXcursor.so.1", "libXcursor.so", "libXcursor.dylib.1", "libXcursor.dylib", "libXcursor.1.dylib", "libXcursor.dylib"], 59,
1515
pub fn XcursorAnimateCreate (_1: *mut XcursorCursors) -> *mut XcursorAnimate,
1616
pub fn XcursorAnimateDestroy (_1: *mut XcursorAnimate) -> (),
1717
pub fn XcursorAnimateNext (_1: *mut XcursorAnimate) -> c_ulong,

‎src/xf86vmode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::xlib::{Bool, Display, Time, Window, XEvent};
1010
// functions
1111
//
1212

13-
x11_link! { Xf86vmode, xxf86vm, ["libXxf86vm.so.1", "libXxf86vm.so"], 22,
13+
x11_link! { Xf86vmode, xxf86vm, ["libXxf86vm.so.1", "libXxf86vm.so", "libXxf86vm.1.dylib", "libXxf86vm.dylib"], 22,
1414
pub fn XF86VidModeAddModeLine (_4: *mut Display, _3: c_int, _2: *mut XF86VidModeModeInfo, _1: *mut XF86VidModeModeInfo) -> c_int,
1515
pub fn XF86VidModeDeleteModeLine (_3: *mut Display, _2: c_int, _1: *mut XF86VidModeModeInfo) -> c_int,
1616
pub fn XF86VidModeGetAllModeLines (_4: *mut Display, _3: c_int, _2: *mut c_int, _1: *mut *mut *mut XF86VidModeModeInfo) -> c_int,

‎src/xfixes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use libc::{c_char, c_int, c_short, c_uint, c_ulong, c_ushort};
99
// functions
1010
//
1111

12-
x11_link! { Xlib, x11, ["libXfixes.so.3", "libXfixes.so"], 35,
12+
x11_link! { Xlib, x11, ["libXfixes.so.3", "libXfixes.so", "libXfixes.3.dylib", "libXfixes.dylib"], 35,
1313
pub fn XFixesQueryExtension(dpy: *mut Display, event_base: *mut c_int, error_base: *mut c_int) -> Bool,
1414
pub fn XFixesQueryVersion(dpy: *mut Display, major_version: *mut c_int, minor_version: *const c_int) -> Status,
1515
pub fn XFixesVersion() -> c_int,

‎src/xft.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub enum FcResult {
3939
// functions
4040
//
4141

42-
x11_link! { Xft, xft, ["libXft.so.2", "libXft.so"], 77,
42+
x11_link! { Xft, xft, ["libXft.so.2", "libXft.so", "libXft.2.dylib", "libXft.dylib"], 77,
4343
pub fn XftCharExists (_2: *mut Display, _1: *mut XftFont, _0: c_uint) -> c_int,
4444
pub fn XftCharFontSpecRender (_7: *mut Display, _6: c_int, _5: c_ulong, _4: c_ulong, _3: c_int, _2: c_int, _1: *const XftCharFontSpec, _0: c_int) -> (),
4545
pub fn XftCharIndex (_2: *mut Display, _1: *mut XftFont, _0: c_uint) -> c_uint,

‎src/xinerama.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::xlib::{Bool, Display, Drawable, Status, Window, XID};
1010
// functions
1111
//
1212

13-
x11_link! { Xlib, xinerama, ["libXinerama.so.1", "libXinerama.so"], 10,
13+
x11_link! { Xlib, xinerama, ["libXinerama.so.1", "libXinerama.so", "libXinerama.1.dylib", "libXinerama.dylib"], 10,
1414
pub fn XineramaIsActive (dpy: *mut Display) -> Bool,
1515
pub fn XineramaQueryExtension (dpy: *mut Display, event_base: *mut c_int, error_base: *mut c_int) -> Bool,
1616
pub fn XineramaQueryScreens (dpy: *mut Display, number: *mut c_int) -> *mut XineramaScreenInfo,

‎src/xinput.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::xlib::{Atom, Display, Time, XEvent, XModifierKeymap, XID};
1010
// functions
1111
//
1212

13-
x11_link! { XInput, xi, ["libXi.so.6", "libXi.so"], 44,
13+
x11_link! { XInput, xi, ["libXi.so.6", "libXi.so", "libXi.6.dylib", "libXi.dylib"], 44,
1414
pub fn XAllowDeviceEvents (_4: *mut Display, _3: *mut XDevice, _2: c_int, _1: c_ulong) -> c_int,
1515
pub fn XChangeDeviceControl (_4: *mut Display, _3: *mut XDevice, _2: c_int, _1: *mut XDeviceControl) -> c_int,
1616
pub fn XChangeDeviceDontPropagateList (_5: *mut Display, _4: c_ulong, _3: c_int, _2: *mut c_ulong, _1: c_int) -> c_int,

‎src/xinput2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn XIMaskIsSet(mask: &[::std::os::raw::c_uchar], event: i32) -> bool {
2424
//
2525
// functions
2626
//
27-
x11_link! { XInput2, xi, ["libXi.so.6", "libXi.so"], 34,
27+
x11_link! { XInput2, xi, ["libXi.so.6", "libXi.so", "libXi.6.dylib", "libXi.dylib"], 34,
2828
pub fn XIAllowEvents (_4: *mut Display, _3: c_int, _2: c_int, _1: c_ulong) -> c_int,
2929
pub fn XIAllowTouchEvents (_5: *mut Display, _4: c_int, _3: c_uint, _2: c_ulong, _1: c_int) -> c_int,
3030
pub fn XIBarrierReleasePointer (_4: *mut Display, _3: c_int, _2: c_ulong, _1: c_uint) -> (),

‎src/xlib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub mod xkb {}
2222
// functions
2323
//
2424

25-
x11_link! { Xlib, x11, ["libX11.so.6", "libX11.so"], 767,
25+
x11_link! { Xlib, x11, ["libX11.so.6", "libX11.so", "libX11.6.dylib", "libX11.dylib", "libX11.6.dylib", "libX11.dylib"], 767,
2626
pub fn XActivateScreenSaver (_1: *mut Display) -> c_int,
2727
pub fn XAddConnectionWatch (_3: *mut Display, _2: Option<unsafe extern "C" fn (*mut Display, *mut c_char, c_int, c_int, *mut *mut c_char)>, _1: *mut c_char) -> c_int,
2828
pub fn XAddExtension (_1: *mut Display) -> *mut XExtCodes,

‎src/xlib_xcb.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use super::xlib::Display;
22
use std::os::raw::c_void;
3-
4-
x11_link! { Xlib_xcb, xlib_xcb, ["libX11-xcb.so.1", "libX11-xcb.so"], 2,
3+
x11_link! { Xlib_xcb, xlib_xcb, ["libX11-xcb.so.1", "libX11-xcb.so", "libX11-xcb.1.dylib", "libX11-xcb.dylib", "libX11-xcb.1.dylib", "libX11-xcb.dylib"], 2,
54
pub fn XGetXCBConnection(_1: *mut Display) -> *mut xcb_connection_t,
65
pub fn XSetEventQueueOwner(_1: *mut Display, _2: XEventQueueOwner) -> (),
76
variadic:

‎src/xmu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use super::xt::{Widget, XtAppContext};
1515
// functions
1616
//
1717

18-
x11_link! { Xmu, xmu, ["libXmu.so.6", "libXmu.so"], 132,
18+
x11_link! { Xmu, xmu, ["libXmu.so.6", "libXmu.so", "libXmu.6.dylib", "libXmu.dylib"], 132,
1919
pub fn XmuAddCloseDisplayHook (_3: *mut Display, _2: Option<unsafe extern "C" fn (*mut Display, *mut c_char) -> c_int>, _1: *mut c_char) -> *mut c_char,
2020
pub fn XmuAddInitializer (_2: Option<unsafe extern "C" fn (XtAppContext, *mut c_char)>, _1: *mut c_char) -> (),
2121
pub fn XmuAllStandardColormaps (_1: *mut Display) -> c_int,

‎src/xpresent.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::xrandr::RRCrtc;
1313
// functions
1414
//
1515

16-
x11_link! { Xpresent, xpresent, ["libXpresent.so.1.0.0", "libXpresent.so"], 8,
16+
x11_link! { Xpresent, xpresent, ["libXpresent.so.1.0.0", "libXpresent.so", "libXpresent.1.0.0.dylib", "libXpresent.dylib"], 8,
1717
pub fn XPresentQueryExtension( dpy: *mut Display, major_opcode_return: *mut c_int, event_base_return: *mut c_int, error_base_return: *mut c_int) -> Bool,
1818
pub fn XPresentQueryVersion( dpy: *mut Display, major_version_return: *mut c_int, minor_version_return: *mut c_int ) -> Status,
1919
pub fn XPresentVersion() -> c_int,

‎src/xrandr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use super::xrender::{XFixed, XTransform};
1111
// functions
1212
//
1313

14-
x11_link! { Xrandr, xrandr, ["libXrandr.so.2", "libXrandr.so"], 70,
14+
x11_link! { Xrandr, xrandr, ["libXrandr.so.2", "libXrandr.so", "libXrandr.2.dylib", "libXrandr.dylib", "libXrandr.2.dylib", "libXrandr.dylib"], 70,
1515
pub fn XRRAddOutputMode (dpy: *mut Display, output: RROutput, mode: RRMode) -> (),
1616
pub fn XRRAllocGamma (size: c_int) -> *mut XRRCrtcGamma,
1717
pub fn XRRAllocModeInfo (name: *const c_char, nameLength: c_int) -> *mut XRRModeInfo,

‎src/xrecord.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::xlib::{Bool, Display, Time, XID};
1010
// functions
1111
//
1212

13-
x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so"], 14,
13+
x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so", "libXtst.6.dylib", "libXtst.dylib"], 14,
1414
pub fn XRecordAllocRange () -> *mut XRecordRange,
1515
pub fn XRecordCreateContext (_6: *mut Display, _5: c_int, _4: *mut c_ulong, _3: c_int, _2: *mut *mut XRecordRange, _1: c_int) -> c_ulong,
1616
pub fn XRecordDisableContext (_2: *mut Display, _1: c_ulong) -> c_int,

‎src/xrender.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::xlib::{Atom, Bool, Colormap, Cursor, Display, Pixmap, Region, Visual,
1010
// functions
1111
//
1212

13-
x11_link! { Xrender, xrender, ["libXrender.so.1", "libXrender.so"], 44,
13+
x11_link! { Xrender, xrender, ["libXrender.so.1", "libXrender.so", "libXrender.1.dylib", "libXrender.dylib"], 44,
1414
pub fn XRenderAddGlyphs (_7: *mut Display, _6: c_ulong, _5: *const c_ulong, _4: *const XGlyphInfo, _3: c_int, _2: *const c_char, _1: c_int) -> (),
1515
pub fn XRenderAddTraps (_6: *mut Display, _5: c_ulong, _4: c_int, _3: c_int, _2: *const XTrap, _1: c_int) -> (),
1616
pub fn XRenderChangePicture (_4: *mut Display, _3: c_ulong, _2: c_ulong, _1: *const XRenderPictureAttributes) -> (),

‎src/xshm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::xlib::{Bool, Display, Drawable, Pixmap, Visual, XImage, GC};
22
use std::os::raw::{c_char, c_int, c_uint, c_ulong};
33

4-
x11_link! { Xext, xext, ["libXext.so.6", "libXext.so"], 10,
4+
x11_link! { Xext, xext, ["libXext.so.6", "libXext.so", "libXext.6.dylib", "libXext.dylib"], 10,
55
pub fn XShmQueryExtension(_1: *mut Display) -> Bool,
66
pub fn XShmGetEventBase(_1: *mut Display) -> c_int,
77
pub fn XShmQueryVersion(_4: *mut Display, _3: *mut c_int, _2: *mut c_int, _1: *mut Bool) -> Bool,

‎src/xss.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::os::raw::{c_int, c_uint, c_ulong};
1111
// functions
1212
//
1313

14-
x11_link! { Xss, xscrnsaver, ["libXss.so.2", "libXss.so"], 11,
14+
x11_link! { Xss, xscrnsaver, ["libXss.so.2", "libXss.so", "libXss.2.dylib", "libXss.dylib"], 11,
1515
pub fn XScreenSaverQueryExtension (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Bool,
1616
pub fn XScreenSaverQueryVersion (_1: *mut Display, _2: *mut c_int, _3: *mut c_int) -> Status,
1717
pub fn XScreenSaverAllocInfo () -> *mut XScreenSaverInfo,

‎src/xt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use super::xlib::{
1313
// functions
1414
//
1515

16-
x11_link! { Xt, xt, ["libXt.so.6", "libXt.so"], 300,
16+
x11_link! { Xt, xt, ["libXt.so.6", "libXt.so", "libXt.6.dylib", "libXt.dylib"], 300,
1717
pub fn XtAddActions (_2: *mut XtActionsRec, _1: c_uint) -> (),
1818
pub fn XtAddCallback (_4: Widget, _3: *const c_char, _2: Option<unsafe extern "C" fn (Widget, *mut c_void, *mut c_void)>, _1: *mut c_void) -> (),
1919
pub fn XtAddCallbacks (_3: Widget, _2: *const c_char, _1: XtCallbackList) -> (),

‎src/xtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use super::xlib::{Display, Visual, GC};
1111
// functions
1212
//
1313

14-
x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so"], 15,
14+
x11_link! { Xf86vmode, xtst, ["libXtst.so.6", "libXtst.so", "libXtst.6.dylib", "libXtst.dylib"], 15,
1515
pub fn XTestCompareCurrentCursorWithWindow (_2: *mut Display, _1: c_ulong) -> c_int,
1616
pub fn XTestCompareCursorWithWindow (_3: *mut Display, _2: c_ulong, _1: c_ulong) -> c_int,
1717
pub fn XTestDiscard (_1: *mut Display) -> c_int,

‎x11-dl/src/old_xrandr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The X11 libraries are available under the MIT license.
33
// These bindings are public domain.
44

5-
x11_link! { Xrandr_2_2_0, xrandr, ["libXrandr.so.2.2.0", "libXrandr.so.2", "libXrandr.so"], 65,
5+
x11_link! { Xrandr_2_2_0, xrandr, ["libXrandr.so.2.2.0", "libXrandr.so.2", "libXrandr.so", "libXrandr.2.2.0.dylib", "libXrandr.2.dylib", "libXrandr.dylib"], 65,
66
pub fn XRRAddOutputMode (dpy: *mut Display, output: RROutput, mode: RRMode) -> (),
77
pub fn XRRAllocGamma (size: c_int) -> *mut XRRCrtcGamma,
88
pub fn XRRAllocModeInfo (name: *const c_char, nameLength: c_int) -> *mut XRRModeInfo,

0 commit comments

Comments
 (0)