diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /avmedia | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/inc/mediamisc.hxx | 2 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/Types.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index a34f318499a7..632c4cd4c43a 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -28,7 +28,7 @@ class ResMgr; #define AVMEDIA_RESSTR( nId ) AVMEDIA_RESID( nId ).toString() #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC" -#ifdef WNT +#ifdef _WIN32 #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" #else #ifdef MACOSX diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 8e3faf41b975..eb71926dfb1d 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -9,7 +9,7 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX -#if defined( WNT ) +#if defined(_WIN32) # include <windows.h> # include <winreg.h> #endif diff --git a/avmedia/source/vlc/wrapper/Types.hxx b/avmedia/source/vlc/wrapper/Types.hxx index ff25be325054..7411b03dc95a 100644 --- a/avmedia/source/vlc/wrapper/Types.hxx +++ b/avmedia/source/vlc/wrapper/Types.hxx @@ -12,7 +12,7 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX -#if defined WNT +#if defined(_WIN32) typedef __int64 libvlc_time_t; #else typedef int64_t libvlc_time_t; |