diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/mimeconfighelper.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/odbc.hxx | 2 | ||||
-rw-r--r-- | include/osl/interlck.h | 2 | ||||
-rw-r--r-- | include/prewin.h | 2 | ||||
-rw-r--r-- | include/sal/mathconf.h | 2 | ||||
-rw-r--r-- | include/sfx2/app.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/lnkbase.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/tools/lineend.hxx | 2 | ||||
-rw-r--r-- | include/tools/pathutils.hxx | 2 | ||||
-rw-r--r-- | include/tools/solar.h | 2 | ||||
-rw-r--r-- | include/vcl/bitmap.hxx | 2 | ||||
-rw-r--r-- | include/vcl/graphicfilter.hxx | 2 | ||||
-rw-r--r-- | include/vcl/settings.hxx | 2 | ||||
-rw-r--r-- | include/vcl/sysdata.hxx | 16 |
15 files changed, 23 insertions, 23 deletions
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx index 81948c76880c..88ac1fc8d02d 100644 --- a/include/comphelper/mimeconfighelper.hxx +++ b/include/comphelper/mimeconfighelper.hxx @@ -112,7 +112,7 @@ public: OUString UpdateMediaDescriptorWithFilterName( css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, css::uno::Sequence< css::beans::NamedValue >& aObject ); -#ifdef WNT +#ifdef _WIN32 SfxFilterFlags GetFilterFlags( const OUString& aFilterName ); bool AddFilterNameCheckOwnFile( diff --git a/include/connectivity/odbc.hxx b/include/connectivity/odbc.hxx index 40ded2986df6..5ce6d8768070 100644 --- a/include/connectivity/odbc.hxx +++ b/include/connectivity/odbc.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX -#if defined(WNT) +#if defined(_WIN32) #ifdef _MSC_VER #pragma warning(push) diff --git a/include/osl/interlck.h b/include/osl/interlck.h index 85da29810446..0b26f9a02712 100644 --- a/include/osl/interlck.h +++ b/include/osl/interlck.h @@ -25,7 +25,7 @@ #include <sal/saldllapi.h> #include <sal/types.h> -#if defined WNT +#if defined(_WIN32) #include <intrin.h> #endif diff --git a/include/prewin.h b/include/prewin.h index e7ad06975d44..17e27e352c92 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -19,7 +19,7 @@ /* not protected, do only include once! */ -#if defined WNT +#if defined(_WIN32) #define Rectangle BLA_Rectangle #define Folder WIN_Folder diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h index 30895b696bb0..5ef63221f67d 100644 --- a/include/sal/mathconf.h +++ b/include/sal/mathconf.h @@ -54,7 +54,7 @@ extern "C" { problems, the SAL_MATH_FPEXCEPTIONS_OFF macro can be used to explicitly switch off exceptions (on Windows). */ -#if defined WNT +#if defined(_WIN32) #define SAL_MATH_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) #else /* WNT */ #define SAL_MATH_FPEXCEPTIONS_OFF() diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index ed618d974854..58738f6e7b07 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -139,13 +139,13 @@ public: static ResMgr* GetSfxResManager(); // DDE -#if defined( WNT ) +#if defined(_WIN32) long DdeExecute( const OUString& rCmd ); #endif bool InitializeDde(); const DdeService* GetDdeService() const; DdeService* GetDdeService(); -#if defined( WNT ) +#if defined(_WIN32) void AddDdeTopic( SfxObjectShell* ); #endif void RemoveDdeTopic( SfxObjectShell* ); diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 5baabf44b808..2a8bb226be8d 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -112,7 +112,7 @@ public: virtual void Closed(); -#if defined WNT +#if defined(_WIN32) SvBaseLink( const OUString& rNm, sal_uInt16 nObjectType, SvLinkSource* ); #endif diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 47f804293b62..90c536e2d757 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -489,7 +489,7 @@ public: OUString GetTitle( sal_uInt16 nMaxLen = 0 ) const; void InvalidateName(); // Re-set to unnamed -#if defined WNT +#if defined(_WIN32) // DDE-Interface long DdeExecute( const OUString& rCmd ); virtual bool DdeGetData( const OUString& rItem, diff --git a/include/tools/lineend.hxx b/include/tools/lineend.hxx index 2682d5d210cd..165d8b549513 100644 --- a/include/tools/lineend.hxx +++ b/include/tools/lineend.hxx @@ -18,7 +18,7 @@ enum LineEnd { LINEEND_CR, LINEEND_LF, LINEEND_CRLF }; inline LineEnd GetSystemLineEnd() { -#if defined WNT +#if defined(_WIN32) return LINEEND_CRLF; #else return LINEEND_LF; diff --git a/include/tools/pathutils.hxx b/include/tools/pathutils.hxx index ddb9852fe61b..3fa5cc0d1e9d 100644 --- a/include/tools/pathutils.hxx +++ b/include/tools/pathutils.hxx @@ -21,7 +21,7 @@ #include <sal/config.h> -#if defined WNT +#if defined(_WIN32) #include <cstddef> #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/include/tools/solar.h b/include/tools/solar.h index e349024fd9d7..e503f38fd908 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -106,7 +106,7 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<s #endif #endif -#if defined WNT +#if defined(_WIN32) #define SVLIBRARY( Base ) Base "lo.dll" #elif defined MACOSX #define SVLIBRARY( Base ) "lib" Base "lo.dylib" diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index e45c8f0dd9bb..7dcc84442801 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -238,7 +238,7 @@ namespace vcl struct BitmapSystemData { - #if defined( WNT ) + #if defined(_WIN32) void* pDIB; // device independent byte buffer void* pDDB; // if not NULL then this is actually an HBITMAP #elif defined( MACOSX ) || defined( IOS ) diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a090c557aa7c..40ea0173f537 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -254,7 +254,7 @@ public: sal_uInt16 GetImportFormatNumberForTypeName( const OUString& rType ); OUString GetImportFormatName( sal_uInt16 nFormat ); OUString GetImportFormatTypeName( sal_uInt16 nFormat ); -#ifdef WNT +#ifdef _WIN32 OUString GetImportFormatMediaType( sal_uInt16 nFormat ); #endif OUString GetImportFormatShortName( sal_uInt16 nFormat ); diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 932bb9c2de08..537cb8f0c140 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -632,7 +632,7 @@ public: MiscSettings(); ~MiscSettings(); -#ifdef WNT +#ifdef _WIN32 void SetEnableATToolSupport( bool bEnable ); #endif bool GetEnableATToolSupport() const; diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 18f39393b274..49511985455e 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -42,7 +42,7 @@ typedef const struct __CTFont * CTFontRef; typedef struct CGContext *CGContextRef; #endif -#if defined( WNT ) +#if defined(_WIN32) #include <prewin.h> #include <windef.h> #include <postwin.h> @@ -51,7 +51,7 @@ typedef struct CGContext *CGContextRef; struct SystemEnvData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) +#if defined(_WIN32) HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* mpNSView; // the cocoa (NSView *) implementing this object @@ -77,7 +77,7 @@ struct SystemEnvData SystemEnvData() : nSize(0) -#if defined( WNT ) +#if defined(_WIN32) , hWnd(0) #elif defined( MACOSX ) , mpNSView(nullptr) @@ -105,7 +105,7 @@ struct SystemEnvData struct SystemParentData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) +#if defined(_WIN32) HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object @@ -122,7 +122,7 @@ struct SystemParentData struct SystemMenuData { -#if defined( WNT ) +#if defined(_WIN32) HMENU hMenu; // the menu handle of the menu bar #else // Nothing @@ -132,7 +132,7 @@ struct SystemMenuData struct SystemGraphicsData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) +#if defined(_WIN32) HDC hDC; // handle to a device context HWND hWnd; // optional handle to a window #elif defined( MACOSX ) @@ -152,7 +152,7 @@ struct SystemGraphicsData #endif SystemGraphicsData() : nSize( sizeof( SystemGraphicsData ) ) -#if defined( WNT ) +#if defined(_WIN32) , hDC( 0 ) , hWnd( 0 ) #elif defined( MACOSX ) @@ -176,7 +176,7 @@ struct SystemGraphicsData struct SystemWindowData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) // meaningless on Windows +#if defined(_WIN32) // meaningless on Windows #elif defined( MACOSX ) bool bOpenGL; // create a OpenGL providing NSView bool bLegacy; // create a 2.1 legacy context, only valid if bOpenGL == true |