summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorA_GAN <ganzouri97@gmail.com>2020-01-25 04:33:09 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2020-01-25 22:02:16 +0100
commit42e811a80a3c6f0ca5da359c4a526a1cc3e0d528 (patch)
treee631dcfab8b2541c471a413dd6c071ba9a80e6c0 /avmedia
parent5568023a716b945fa3e1398859ee9682b8f71a9a (diff)
tdf#130137 Replace remaining uses of WNT define checks with _WIN32
Change-Id: If95f1ea5a81de62eb4f725e5fcb30ccb8530062a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87372 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx2
-rw-r--r--avmedia/source/vlc/wrapper/Player.cxx6
-rw-r--r--avmedia/source/vlc/wrapper/SymbolLoader.hxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index bbb386240998..bd2cc92baeec 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -173,7 +173,7 @@ namespace
#if defined MACOSX
const intptr_t id = reinterpret_cast<intptr_t>( pEnvData->mpNSView );
-#elif defined WNT
+#elif defined _WIN32
const intptr_t id = reinterpret_cast<intptr_t>( pEnvData->hWnd );
#else
const intptr_t id = static_cast<intptr_t>( pEnvData->aWindow );
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index acdda3754129..e80b8df043bb 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -40,7 +40,7 @@ namespace { extern "C" {
void ( *libvlc_media_player_set_xwindow ) ( libvlc_media_player_t *p_mi, uint32_t drawable );
#elif defined MACOSX
void ( *libvlc_media_player_set_nsobject ) ( libvlc_media_player_t *p_mi, void *drawable );
-#elif defined WNT
+#elif defined _WIN32
void ( *libvlc_media_player_set_hwnd ) ( libvlc_media_player_t *p_mi, void *drawable );
#else
#error unknown OS
@@ -83,7 +83,7 @@ namespace avmedia::vlc::wrapper
SYM_MAP( libvlc_media_player_set_xwindow ),
#elif defined MACOSX
SYM_MAP( libvlc_media_player_set_nsobject ),
-#elif defined WNT
+#elif defined _WIN32
SYM_MAP( libvlc_media_player_set_hwnd ),
#endif
SYM_MAP( libvlc_media_player_has_vout ),
@@ -220,7 +220,7 @@ namespace avmedia::vlc::wrapper
libvlc_media_player_set_xwindow( mPlayer, static_cast<uint32_t>(id) );
#elif defined MACOSX
libvlc_media_player_set_nsobject( mPlayer, reinterpret_cast<void*>( id ) );
-#elif defined WNT
+#elif defined _WIN32
libvlc_media_player_set_hwnd( mPlayer, reinterpret_cast<void*>( id ) );
#endif
}
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index aae124cb2575..03952eaff371 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -40,7 +40,7 @@ struct ApiMap
const char LibName[] = "libvlc.so.5";
#elif defined( MACOSX )
const char LibName[] = "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib";
-#elif defined( WNT )
+#elif defined( _WIN32 )
const char LibName[] = "libvlc.dll";
inline OUString GetVLCPath()
@@ -95,7 +95,7 @@ struct ApiMap
{
#if defined( LINUX ) || defined( MACOSX )
OUString const fullPath(LibName);
-#elif defined( WNT )
+#elif defined( _WIN32 )
OUString const fullPath(GetVLCPath() + LibName);
#endif
SAL_INFO("avmedia", fullPath);