diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-03 23:05:05 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-03 23:06:25 +0300 |
| commit | fd47df122a37b4fa982f9fd0000907d9aee0c80a (patch) | |
| tree | 379e6b817aef3c0137c65e941b88d1c9f582a745 /avmedia/source/vlc/wrapper/SymbolLoader.hxx | |
| parent | 3105e301c4f6dc008f0532ba051ee158a28c58a7 (diff) | |
Fix typos and make the VLC code in theory work as 64-bit on Windows and OS X
It's MACOSX, not MACOS.
We can't cast a HWND or a pointer to an int and then back.
Have the UNX/MACOSX/WNT branches in the same order each time, at least
in Player.cxx.
Change-Id: I1a71efc2152970952cf2f12f719fd4c455f89dba
Diffstat (limited to 'avmedia/source/vlc/wrapper/SymbolLoader.hxx')
| -rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 8f70dab595c6..3f97fa5964e3 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -31,7 +31,7 @@ namespace { #if defined( UNX ) const char LibName[] = "libvlc.so.5"; -#elif defined( MACOS ) +#elif defined( MACOSX ) const char LibName[] = "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib"; #elif defined( WNT ) const char LibName[] = "libvlc.dll"; @@ -87,7 +87,7 @@ namespace VLC template<size_t N> bool InitApiMap( const ApiMap ( &pMap )[N] ) { -#if defined( UNX ) || defined( MACOS ) +#if defined( UNX ) || defined( MACOSX ) const OUString& fullPath = OUString::createFromAscii(LibName); #elif defined( WNT ) const OUString& fullPath = GetVLCPath() + OUString::createFromAscii(LibName); |