[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basic/qa basic/source bin/update_pch canvas/source chart2/source cli_ure/source comphelper/source configmgr/source connectivity/inc connectivity/source cppuhelper/source cui/source dbaccess/qa dbaccess/source desktop/source drawinglayer/source embeddedobj/source embeddedobj/test extensions/source external/jpeg filter/source fpicker/source framework/source helpcompiler/inc helpcompiler/source i18nlangtag/source idlc/source include/comphelper include/connectivity include/osl include/prewin.h include/sal include/sfx2 include/tools include/vcl jurt/source jvmfwk/plugins jvmfwk/source l10ntools/inc l10ntools/source lingucomponent/source odk/CustomTarget_allheaders.mk onlineupdate/source opencl/source postprocess/qa pyuno/source rsc/source sal/cppunittester salhelper/source sal/qa sal/workben sc/inc sc/qa sc/source sdext/source sd/qa sd/source sfx2/source shell/source solenv/bin soltools/cpp soltools/mkdepend sot/inc sot/ source stoc/source svl/qa svl/source svtools/source svx/inc svx/source sw/inc sw/qa sw/source toolkit/source tools/qa tools/source ucb/source uui/source vcl/inc vcl/opengl vcl/qa vcl/source xmlhelp/source xmlsecurity/inc xmlsecurity/source xmlsecurity/workben
Noel Grandin
noel at peralex.com
Wed Feb 17 11:34:28 UTC 2016
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2
accessibility/source/standard/vclxaccessiblebox.cxx | 4
avmedia/source/inc/mediamisc.hxx | 2
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2
avmedia/source/vlc/wrapper/Types.hxx | 2
basctl/source/basicide/baside3.cxx | 2
basic/qa/cppunit/test_vba.cxx | 2
basic/source/comp/parser.cxx | 2
basic/source/runtime/dllmgr-none.cxx | 2
basic/source/runtime/dllmgr-x64.cxx | 2
basic/source/runtime/dllmgr-x86.cxx | 2
basic/source/runtime/methods.cxx | 6
basic/source/runtime/methods1.cxx | 6
basic/source/sbx/sbxdec.hxx | 2
bin/update_pch | 4
canvas/source/cairo/cairo_services.cxx | 2
canvas/source/tools/elapsedtime.cxx | 4
chart2/source/view/charttypes/GL3DBarChart.cxx | 2
cli_ure/source/native/path.cxx | 2
comphelper/source/misc/mimeconfighelper.cxx | 2
configmgr/source/components.cxx | 4
configmgr/source/writemodfile.cxx | 2
configmgr/source/writemodfile.hxx | 2
connectivity/inc/pch/precompiled_ado.hxx | 2
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 2
connectivity/source/drivers/odbc/OFunctions.cxx | 2
cppuhelper/source/findsofficepath.c | 2
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/options/optmemory.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
dbaccess/qa/extras/dialog-save.cxx | 2
dbaccess/qa/extras/empty-stdlib-save.cxx | 2
dbaccess/qa/extras/macros-test.cxx | 2
dbaccess/qa/extras/nolib-save.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/adodatalinks.cxx | 2
dbaccess/source/ui/dlg/odbcconfig.cxx | 2
dbaccess/source/ui/dlg/odbcconfig.hxx | 4
desktop/source/app/app.cxx | 10 -
desktop/source/app/officeipcthread.cxx | 2
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 6
desktop/source/deployment/misc/dp_misc.cxx | 12 -
desktop/source/deployment/misc/lockfile.cxx | 4
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 6
embeddedobj/source/inc/oleembobj.hxx | 18 +-
embeddedobj/source/msole/oleembed.cxx | 18 +-
embeddedobj/source/msole/olemisc.cxx | 10 -
embeddedobj/source/msole/olepersist.cxx | 22 +-
embeddedobj/source/msole/oleregister.cxx | 4
embeddedobj/source/msole/olevisual.cxx | 8 -
embeddedobj/source/msole/xdialogcreator.cxx | 6
embeddedobj/test/Container1/nativelib/nativeview.c | 6
extensions/source/abpilot/typeselectionpage.cxx | 2
extensions/source/config/ldap/ldapaccess.cxx | 14 -
extensions/source/config/ldap/ldapaccess.hxx | 2
extensions/source/scanner/scanwin.cxx | 2
extensions/source/update/check/download.cxx | 2
extensions/source/update/check/updatecheck.cxx | 12 -
extensions/source/update/check/updatecheckconfig.cxx | 6
external/jpeg/configs/jconfig.h | 2
filter/source/graphicfilter/ieps/ieps.cxx | 6
fpicker/source/office/iodlg.cxx | 2
framework/source/fwi/helper/networkdomain.cxx | 2
framework/source/helper/titlebarupdate.cxx | 2
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 2
helpcompiler/inc/HelpCompiler.hxx | 2
helpcompiler/source/HelpCompiler.cxx | 2
helpcompiler/source/HelpLinker.cxx | 10 -
i18nlangtag/source/isolang/insys.cxx | 2
idlc/source/options.cxx | 6
include/comphelper/mimeconfighelper.hxx | 2
include/connectivity/odbc.hxx | 2
include/osl/interlck.h | 2
include/prewin.h | 2
include/sal/mathconf.h | 2
include/sfx2/app.hxx | 4
include/sfx2/lnkbase.hxx | 2
include/sfx2/objsh.hxx | 2
include/tools/lineend.hxx | 2
include/tools/pathutils.hxx | 2
include/tools/solar.h | 2
include/vcl/bitmap.hxx | 2
include/vcl/graphicfilter.hxx | 2
include/vcl/settings.hxx | 2
include/vcl/sysdata.hxx | 16 +-
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c | 10 -
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 10 -
jvmfwk/source/elements.cxx | 2
jvmfwk/source/elements.hxx | 2
jvmfwk/source/framework.cxx | 2
jvmfwk/source/fwkutil.cxx | 4
l10ntools/inc/export.hxx | 2
l10ntools/source/helpmerge.cxx | 2
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 8 -
lingucomponent/source/languageguessing/guesslang.cxx | 2
lingucomponent/source/lingutil/lingutil.cxx | 4
lingucomponent/source/lingutil/lingutil.hxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
odk/CustomTarget_allheaders.mk | 8 -
onlineupdate/source/libmar/sign/mar_sign.c | 4
onlineupdate/source/libmar/sign/nss_secutil.c | 2
onlineupdate/source/libmar/src/mar.h | 2
onlineupdate/source/libmar/src/mar_create.c | 2
onlineupdate/source/libmar/src/mar_extract.c | 6
onlineupdate/source/libmar/src/mar_private.h | 2
onlineupdate/source/libmar/src/mar_read.c | 4
onlineupdate/source/libmar/tool/mar.c | 20 +-
onlineupdate/source/libmar/verify/cryptox.c | 2
onlineupdate/source/libmar/verify/mar_verify.c | 2
onlineupdate/source/update/common/pathhash.cxx | 2
onlineupdate/source/update/common/readstrings.cxx | 2
onlineupdate/source/update/common/readstrings.h | 2
onlineupdate/source/update/common/uachelper.cxx | 2
onlineupdate/source/update/common/updatedefines.h | 2
onlineupdate/source/update/common/updatehelper.cxx | 2
onlineupdate/source/update/common/updatelogging.cxx | 2
onlineupdate/source/update/common/win_dirent.h | 2
onlineupdate/source/update/src/mar.h | 2
onlineupdate/source/update/src/mar_create.c | 2
onlineupdate/source/update/src/mar_extract.c | 6
onlineupdate/source/update/src/mar_private.h | 2
onlineupdate/source/update/src/mar_read.c | 4
onlineupdate/source/update/updater/archivereader.cxx | 6
onlineupdate/source/update/updater/archivereader.h | 2
onlineupdate/source/update/updater/bspatch.cxx | 4
onlineupdate/source/update/updater/loaddlls.cxx | 2
onlineupdate/source/update/updater/nsWindowsRestart.cxx | 2
onlineupdate/source/update/updater/progressui.h | 4
onlineupdate/source/update/updater/progressui_null.cxx | 4
onlineupdate/source/update/updater/progressui_win.cxx | 2
onlineupdate/source/update/updater/updater.cxx | 74 +++++-----
onlineupdate/source/update/updater/win_dirent.cxx | 2
onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx | 12 -
onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.h | 6
opencl/source/openclconfig.cxx | 2
postprocess/qa/services.cxx | 6
pyuno/source/loader/pyuno_loader.cxx | 2
rsc/source/rscpp/cpp.h | 2
rsc/source/rscpp/cpp3.c | 2
rsc/source/tools/rsctools.cxx | 2
sal/cppunittester/cppunittester.cxx | 4
sal/qa/osl/file/osl_File.cxx | 34 ++--
sal/qa/osl/file/osl_File_Const.h | 2
sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx | 6
sal/qa/osl/module/osl_Module.cxx | 2
sal/qa/osl/module/osl_Module_Const.h | 5
sal/qa/osl/process/osl_Thread.cxx | 20 +-
sal/qa/osl/process/osl_process.cxx | 10 -
sal/qa/osl/process/osl_process_child.cxx | 6
sal/qa/osl/security/osl_Security.cxx | 6
sal/qa/osl/security/osl_Security_Const.h | 2
sal/qa/osl/setthreadname/test-setthreadname.cxx | 2
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 4
sal/qa/rtl/process/rtl_Process.cxx | 4
sal/qa/rtl/uuid/rtl_Uuid.cxx | 2
sal/workben/t_ojp_exe.cxx | 4
sal/workben/t_osl_getVolInfo.cxx | 2
sal/workben/t_osl_joinProcess.cxx | 2
sal/workben/testfile.cxx | 8 -
sal/workben/testproc.cxx | 2
salhelper/source/simplereferenceobject.cxx | 4
sc/inc/callform.hxx | 2
sc/qa/unit/helper/debughelper.hxx | 2
sc/qa/unit/helper/qahelper.cxx | 2
sc/qa/unit/subsequent_export-test.cxx | 4
sc/qa/unit/subsequent_filters-test.cxx | 8 -
sc/source/core/data/formulacell.cxx | 2
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/orcus/orcusfiltersimpl.cxx | 2
sc/source/ui/docshell/datastream.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/view/select.cxx | 4
sd/qa/unit/tiledrendering/tiledrendering.cxx | 14 -
sd/source/helper/simplereferencecomponent.cxx | 8 -
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 2
sd/source/ui/remotecontrol/DiscoveryService.cxx | 4
sd/source/ui/view/drviews7.cxx | 2
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4
sfx2/source/appl/appdde.cxx | 16 +-
sfx2/source/appl/impldde.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 4
sfx2/source/appl/shutdownicon.cxx | 8 -
sfx2/source/appl/shutdownicon.hxx | 2
sfx2/source/dialog/filedlghelper.cxx | 6
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/doc/graphhelp.cxx | 6
sfx2/source/doc/graphhelp.hxx | 2
sfx2/source/doc/sfxacldetect.cxx | 2
sfx2/source/doc/syspath.cxx | 4
sfx2/source/doc/syspathw32.cxx | 4
shell/source/backends/localebe/localebackend.cxx | 8 -
shell/source/tools/lngconvex/lngconvex.cxx | 8 -
solenv/bin/modules/installer/control.pm | 2
soltools/cpp/_unix.c | 4
soltools/mkdepend/collectdircontent.cxx | 4
soltools/mkdepend/collectdircontent.hxx | 2
soltools/mkdepend/main.c | 2
sot/inc/sysformats.hxx | 2
sot/source/base/formats.cxx | 2
stoc/source/typeconv/convert.cxx | 2
svl/qa/unit/svl.cxx | 2
svl/qa/unit/test_URIHelper.cxx | 2
svl/source/config/languageoptions.cxx | 4
svl/source/svdde/ddedata.cxx | 4
svtools/source/control/inettbc.cxx | 4
svtools/source/dialogs/insdlg.cxx | 2
svtools/source/misc/imagemgr.cxx | 2
svtools/source/misc/transfer.cxx | 6
svtools/source/uno/fpicker.cxx | 2
svx/inc/pch/precompiled_svx.hxx | 2
svx/source/engine3d/scene3d.cxx | 2
svx/source/gengal/gengal.cxx | 2
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 2
svx/source/svdraw/svdotext.cxx | 2
svx/source/unodraw/recoveryui.cxx | 6
sw/inc/docsh.hxx | 2
sw/inc/view.hxx | 2
sw/qa/core/layout-test.cxx | 2
sw/qa/core/macros-test.cxx | 6
sw/qa/extras/globalfilter/globalfilter.cxx | 6
sw/qa/extras/odfimport/odfimport.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2
sw/qa/extras/rtfimport/rtfimport.cxx | 2
sw/source/core/doc/doc.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 4
sw/source/ui/vba/vbasystem.cxx | 8 -
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 6
sw/source/uibase/docvw/romenu.cxx | 4
sw/source/uibase/envelp/envimg.cxx | 2
sw/source/uibase/uiview/uivwimp.cxx | 2
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewstat.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 2
sw/source/uibase/utlui/initui.cxx | 2
toolkit/source/awt/vclxsystemdependentwindow.cxx | 10 -
toolkit/source/awt/vclxtoolkit.cxx | 8 -
toolkit/source/awt/vclxtopwindow.cxx | 10 -
toolkit/source/awt/vclxwindow1.cxx | 4
tools/qa/cppunit/test_pathutils.cxx | 2
tools/source/datetime/tdate.cxx | 4
tools/source/datetime/ttime.cxx | 8 -
tools/source/generic/config.cxx | 4
tools/source/inet/inetmime.cxx | 8 -
tools/source/misc/pathutils.cxx | 2
tools/source/stream/strmsys.cxx | 2
tools/source/stream/strmwnt.cxx | 2
ucb/source/ucp/file/prov.cxx | 2
ucb/source/ucp/file/shell.cxx | 2
uui/source/openlocked.cxx | 2
vcl/inc/fontselect.hxx | 4
vcl/inc/graphite_layout.hxx | 2
vcl/inc/graphite_static.hxx | 2
vcl/inc/sft.hxx | 2
vcl/inc/svsys.h | 2
vcl/inc/win/svsys.h | 2
vcl/opengl/salbmp.cxx | 12 -
vcl/qa/cppunit/BitmapTest.cxx | 2
vcl/qa/cppunit/complextext.cxx | 6
vcl/qa/cppunit/timer.cxx | 2
vcl/source/app/settings.cxx | 6
vcl/source/app/svapp.cxx | 2
vcl/source/app/svmain.cxx | 8 -
vcl/source/control/button.cxx | 2
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/filter/sgvtext.cxx | 6
vcl/source/font/fontselect.cxx | 2
vcl/source/fontsubset/sft.cxx | 2
vcl/source/glyphs/graphite_features.cxx | 2
vcl/source/glyphs/graphite_layout.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 20 +-
vcl/source/window/layout.cxx | 2
vcl/source/window/mouse.cxx | 2
vcl/source/window/syschild.cxx | 2
vcl/source/window/toolbox.cxx | 4
vcl/source/window/window.cxx | 6
xmlhelp/source/cxxhelp/provider/databases.cxx | 4
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 2
xmlsecurity/workben/signaturetest.cxx | 2
299 files changed, 626 insertions(+), 627 deletions(-)
New commits:
commit 2087484c65a3d5e75a9e8ad116d11a4e13366219
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 16 14:14:43 2016 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 37f8da2..41d27b0 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -192,7 +192,7 @@ OUString OAccessibleMenuItemComponent::GetAccessibleName()
if ( sName.isEmpty() )
sName = m_pParent->GetItemText( nItemId );
sName = OutputDevice::GetNonMnemonicString( sName );
-#if defined WNT
+#if defined(_WIN32)
if ( m_pParent->GetAccelKey( nItemId ).GetName().getLength() )
sName = sName + "\t" + m_pParent->GetAccelKey(nItemId).GetName();
#endif
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 529b040..ae4e5a6 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -124,7 +124,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
if ( pList != nullptr )
{
pList->ProcessWindowEvent (rVclWindowEvent, m_bIsDropDownBox);
-#if defined WNT
+#if defined(_WIN32)
if (m_bIsDropDownBox)
{
NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
@@ -181,7 +181,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
if ( sText.isEmpty() )
sText = xText->getText();
pList->UpdateSelection_Acc(sText, m_bIsDropDownBox);
-#if defined WNT
+#if defined(_WIN32)
if (m_bIsDropDownBox || m_aBoxType==COMBOBOX)
NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
#endif
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index a34f318..632c4cd 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 8e3faf4..eb71926 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 ff25be3..7411b03 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;
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 21e8d97..72a7ab7 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::resource;
using namespace ::com::sun::star::ui::dialogs;
-#ifdef WNT
+#ifdef _WIN32
char const FilterMask_All[] = "*.*";
#else
char const FilterMask_All[] = "*";
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 2b7ba58..b70d510 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -81,7 +81,7 @@ void VBATest::testMiscVBAFunctions()
void VBATest::testMiscOLEStuff()
{
// not much point even trying to run except on windows
-#if defined(WNT)
+#if defined(_WIN32)
// test if we have the necessary runtime environment
// to run the OLE tests.
uno::Reference< lang::XMultiServiceFactory > xOLEFactory;
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 93825e1..2048163 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -848,7 +848,7 @@ void SbiParser::AddConstants()
addStringConst( aPublics, "vbCrLf", "\x0D\x0A" );
addStringConst( aPublics, "vbFormFeed", "\x0C" );
addStringConst( aPublics, "vbLf", "\x0A" );
-#ifndef WNT
+#ifndef _WIN32
addStringConst( aPublics, "vbNewLine", "\x0D\x0A" );
#else
addStringConst( aPublics, "vbNewLine", "\x0A" );
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index 3d720bb..8c07364 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#if defined(WNT)
+#if defined(_WIN32)
#include <prewin.h>
#include <postwin.h>
#endif
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 78fb890..48e5cc7 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#if defined(WNT)
+#if defined(_WIN32)
#include <prewin.h>
#include <postwin.h>
#endif
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 2c32b4a..2bb2993 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#if defined(WNT)
+#if defined(_WIN32)
#include <prewin.h>
#include <postwin.h>
#endif
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6015cba..85aca7d 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -88,7 +88,7 @@ using namespace com::sun::star::uno;
#include "sbobjmod.hxx"
#include "sbxmod.hxx"
-#ifdef WNT
+#ifdef _WIN32
#include <prewin.h>
#include <direct.h>
#include <io.h>
@@ -392,7 +392,7 @@ RTLFUNC(CurDir)
// there's no possibility to detect the current one in a way that a virtual URL
// could be delivered.
-#if defined (WNT)
+#if defined(_WIN32)
int nCurDir = 0; // Current dir // JSM
if ( rPar.Count() == 2 )
{
@@ -3117,7 +3117,7 @@ RTLFUNC(GetAttr)
// In Windows, we want to use Windows API to get the file attributes
// for VBA interoperability.
- #if defined( WNT )
+ #if defined(_WIN32)
if( SbiRuntime::isVBAEnabled() )
{
OUString aPathURL = getFullPath( rPar.Get(1)->GetOUString() );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index f619b37..689aa0d 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -284,7 +284,7 @@ RTLFUNC(CDec)
(void)pBasic;
(void)bWrite;
-#ifdef WNT
+#ifdef _WIN32
SbxDecimal* pDec = NULL;
if ( rPar.Count() == 2 )
{
@@ -525,9 +525,9 @@ RTLFUNC(GetGUIType)
else
{
// 17.7.2000 Make simple solution for testtool / fat office
-#if defined (WNT)
+#if defined(_WIN32)
rPar.Get(0)->PutInteger( 1 );
-#elif defined UNX
+#elif defined(UNX)
rPar.Get(0)->PutInteger( 4 );
#else
rPar.Get(0)->PutInteger( -1 );
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index eb71f2c..1c3461a 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -21,7 +21,7 @@
#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
#define INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
-#ifdef WNT
+#ifdef _WIN32
#include <prewin.h>
#include <postwin.h>
diff --git a/bin/update_pch b/bin/update_pch
index 037dca8..d910ee1 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -750,7 +750,7 @@ def generate(includes, libname, filename, module):
# svx needs this (sendreportw32.cxx)
if module == 'svx' and libname == 'svx':
svx_define = """
-#ifdef WNT
+#ifdef _WIN32
# define UNICODE
# define _UNICODE
#endif
@@ -767,7 +767,7 @@ def generate(includes, libname, filename, module):
(module == 'xmlsecurity' and libname == 'xsec_xmlsec'):
ado_define = """
// Cleanup windows header macro pollution.
-#if defined(WNT) && defined(WINAPI)
+#if defined(_WIN32) && defined(WINAPI)
# include <postwin.h>
# undef RGB
#endif
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 9cd28b1..10c0e31 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -36,7 +36,7 @@
using namespace ::com::sun::star;
-#if defined(WNT) || defined (MACOSX)
+#if defined(_WIN32) || defined (MACOSX)
# error "The cairo canvas should not be enabled on Windows or Mac cf fdo#46901"
#endif
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index d080c78..bde8032 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -24,7 +24,7 @@
#include <canvas/elapsedtime.hxx>
-#if defined(WNT)
+#if defined(_WIN32)
#if defined _MSC_VER
#pragma warning(push,1)
@@ -50,7 +50,7 @@ namespace canvas {
namespace tools {
-#if defined(WNT)
+#if defined(_WIN32)
// TODO(Q2): is 0 okay for the failure case here?
double ElapsedTime::getSystemTime()
{
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 748bcc7..5339fcf 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -20,7 +20,7 @@
#include <DataSeriesHelper.hxx>
#include <osl/time.h>
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#endif
#include <memory>
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 006c70f..6fae513 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -19,7 +19,7 @@
#include "sal/config.h"
-#if defined WNT
+#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 4a6782e..5f6a93e 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -664,7 +664,7 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
return UpdateMediaDescriptorWithFilterName( aMediaDescr, true );
}
-#ifdef WNT
+#ifdef _WIN32
SfxFilterFlags MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName )
{
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index b1b4b72..3f94a8d 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -69,7 +69,7 @@
#include <dconf.hxx>
#endif
-#if defined WNT
+#if defined(_WIN32)
#include "winreg.hxx"
#endif
@@ -546,7 +546,7 @@ Components::Components(
}
++layer; //TODO: overflow
#endif
-#if defined WNT
+#if defined(_WIN32)
} else if (type == "winreg") {
WinRegType eType;
if (url == "LOCAL_MACHINE" || url.isEmpty()/*backwards comp.*/) {
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 0824bae..d04818e 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -93,7 +93,7 @@ TempFile::~TempFile() {
}
}
-#ifdef WNT
+#ifdef _WIN32
oslFileError TempFile::closeWithoutUnlink() {
flush();
oslFileError e = osl_closeFile(handle);
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index caa9eee..d1a9348 100644
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
@@ -38,7 +38,7 @@ struct TempFile {
~TempFile();
void closeAndRename(const OUString &url);
oslFileError flush();
-#ifdef WNT
+#ifdef _WIN32
oslFileError closeWithoutUnlink();
#endif
void writeString(char const *begin, sal_Int32 length);
diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx
index 5e7ce61..1e7ad13 100644
--- a/connectivity/inc/pch/precompiled_ado.hxx
+++ b/connectivity/inc/pch/precompiled_ado.hxx
@@ -70,7 +70,7 @@
#include <connectivity/sdbcx/IRefreshable.hxx>
// Cleanup windows header macro pollution.
-#ifdef WNT
+#ifdef _WIN32
# include <postwin.h>
# undef RGB
#endif
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 4025aba..cf6ad3f 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -119,7 +119,7 @@ namespace connectivity
OUString StorageContainer::removeOldURLPrefix(const OUString& _sURL)
{
OUString sRet = _sURL;
-#if defined(WNT)
+#if defined(_WIN32)
sal_Int32 nIndex = sRet.lastIndexOf('\\');
#else
sal_Int32 nIndex = sRet.lastIndexOf('/');
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 29f4e19..24492f1 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -25,7 +25,7 @@
#include <string.h>
#endif // End UNIX
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#include <stdlib.h>
#include <shlobj.h>
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 84583c4..2525701 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -90,7 +90,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath)
if (bLoaded)
return true;
-#ifdef WNT
+#ifdef _WIN32
_rPath = "ODBC32.DLL";
#endif
#ifdef UNX
diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index b199e4e..2a45f88 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -24,7 +24,7 @@
#include <cppuhelper/findsofficepath.h>
-#if defined WNT
+#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index dfb8297..a2abaad 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -961,7 +961,7 @@ void TPGalleryThemeProperties::FillFilterList()
}
}
-#if defined(WNT)
+#if defined(_WIN32)
if (aExtensions.getLength() > 240)
aExtensions = "*.*";
#endif
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index a024162..8e2bd66 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -214,7 +214,7 @@ namespace
return OUString();
#endif
}
- #if defined WNT
+ #if defined(_WIN32)
return OUString("com.sun.star.ui.dialogs.SystemFilePicker");
#elif defined MACOSX
return OUString("com.sun.star.ui.dialogs.AquaFilePicker");
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 20be147..344a66c 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -130,7 +130,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe
m_pQuickLaunchCB->Show();
//Only available in Win or if building the gtk systray
-#if !defined(WNT) && ! ENABLE_GTK
+#if !defined(_WIN32) && ! ENABLE_GTK
m_pQuickStarterFrame->Hide();
#endif
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 160f0a3..0bbd5c7 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1768,7 +1768,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
nPageId = (sal_uInt16)rInetArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
continue;
-#if defined WNT
+#if defined(_WIN32)
// Disable E-mail tab-page on Windows
if ( nPageId == RID_SVXPAGE_INET_MAIL )
continue;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index db26ba4..66a7fa4 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2411,7 +2411,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
OStringBuffer sData;
const sal_Char aLineEnd[] =
-#if defined(WNT)
+#if defined(_WIN32)
"\015\012";
#else
"\012";
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 99e3382..3852717 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -330,7 +330,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
//Family, Style
//In Windows the standard dialogs name font-name, font-style as
//Font, Style
-#ifdef WNT
+#ifdef _WIN32
OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FONT));
#else
OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FAMILY));
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 21cd0b3..b7fee0d 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -505,7 +505,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
m_pLbGradients->SelectEntryPos( m_pLbGradients->GetEntryCount() - 1 );
-#ifdef WNT
+#ifdef _WIN32
// hack: #31355# W.P.
Rectangle aRect( m_pLbGradients->GetPosPixel(), m_pLbGradients->GetSizePixel() );
if( sal_True ) { // ??? overlapped with pDlg
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index a12478f..6700093 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -539,7 +539,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
m_pLbHatchings->SelectEntryPos( m_pLbHatchings->GetEntryCount() - 1 );
-#ifdef WNT
+#ifdef _WIN32
// hack: #31355# W.P.
Rectangle aRect( m_pLbHatchings->GetPosPixel(), m_pLbHatchings->GetSizePixel() );
if( sal_True ) { // ??? overlapped with pDlg
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index 5426919..38344df 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -46,7 +46,7 @@ public:
CPPUNIT_TEST_SUITE(DialogSaveTest);
// Should we disable this test on MOX and WNT?
-// #if !defined(MACOSX) && !defined(WNT)
+// #if !defined(MACOSX) && !defined(_WIN32)
CPPUNIT_TEST(test);
// #endif
CPPUNIT_TEST_SUITE_END();
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 3f84d53..d8e355c 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -46,7 +46,7 @@ public:
CPPUNIT_TEST_SUITE(DialogSaveTest);
// Should we disable this test on MOX and WNT?
-// #if !defined(MACOSX) && !defined(WNT)
+// #if !defined(MACOSX) && !defined(_WIN32)
CPPUNIT_TEST(test);
// #endif
CPPUNIT_TEST_SUITE_END();
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 7600720..d6c7e6b 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -23,7 +23,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(MACOSX) && !defined(_WIN32)
class DBAccessTest : public UnoApiTest
{
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index 3f1ca91..c41dc26 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -46,7 +46,7 @@ public:
CPPUNIT_TEST_SUITE(DialogSaveTest);
// Should we disable this test on MOX and WNT?
-// #if !defined(MACOSX) && !defined(WNT)
+// #if !defined(MACOSX) && !defined(_WIN32)
CPPUNIT_TEST(test);
// #endif
CPPUNIT_TEST_SUITE_END();
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index e1eec6b..7fd4ff4 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -60,7 +60,7 @@
#include <tools/diagnose_ex.h>
#include <sfx2/docfilt.hxx>
-#if defined(WNT)
+#if defined(_WIN32)
#define _ADO_DATALINK_BROWSE_
#endif
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index ddd01be..7eb9d3c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -59,7 +59,7 @@
#include <connectivity/CommonTools.hxx>
#include <sfx2/docfilt.hxx>
#include "dsnItem.hxx"
-#if defined(WNT)
+#if defined(_WIN32)
#define _ADO_DATALINK_BROWSE_
#endif
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 5ce581b..37a3bc3 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -18,7 +18,7 @@
*/
-#if defined(WNT)
+#if defined(_WIN32)
#if defined _MSC_VER
#pragma warning(push, 1)
#pragma warning(disable: 4917)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 25e53db..b4c482d 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -31,7 +31,7 @@
#ifdef HAVE_ODBC_SUPPORT
-#if defined WNT
+#if defined(_WIN32)
#define ODBC_LIBRARY "ODBC32.DLL"
#endif
#ifdef UNX
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 4d69bf1..5d0fcae 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -22,11 +22,11 @@
#include "commontypes.hxx"
-#if defined(WNT) || (defined (UNX) && !defined(ANDROID) && !defined(IOS))
+#if defined(_WIN32) || (defined (UNX) && !defined(ANDROID) && !defined(IOS))
#define HAVE_ODBC_SUPPORT
#endif
-#if defined(WNT) && defined(HAVE_ODBC_SUPPORT)
+#if defined(_WIN32) && defined(HAVE_ODBC_SUPPORT)
#define HAVE_ODBC_ADMINISTRATION
#endif
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d5e5c2c..107639d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -124,7 +124,7 @@
#include <sys/wait.h>
#endif
-#ifdef WNT
+#ifdef _WIN32
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#pragma warning (disable: 4005)
@@ -136,7 +136,7 @@
#endif
#endif //WNT
-#if defined WNT
+#if defined(_WIN32)
#include <process.h>
#define GETPID _getpid
#else
@@ -1895,7 +1895,7 @@ IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void)
CloseSplashScreen();
CheckFirstRun( );
-#ifdef WNT
+#ifdef _WIN32
// Registers a COM class factory of the service manager with the windows operating system.
Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory();
xSMgr->createInstance("com.sun.star.bridge.OleApplicationRegistration");
@@ -2180,7 +2180,7 @@ void Desktop::OpenClients()
{
aIniName = aIniName.copy( 0, lastIndex+1 );
aIniName += "perftune";
-#if defined(WNT)
+#if defined(_WIN32)
aIniName += ".ini";
#else
aIniName += "rc";
@@ -2784,7 +2784,7 @@ void Desktop::CheckFirstRun( )
m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.Start();
-#ifdef WNT
+#ifdef _WIN32
// Check if Quickstarter should be started (on Windows only)
TCHAR szValue[8192];
DWORD nValueSize = sizeof(szValue);
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 70213f2..a350579 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -499,7 +499,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
{
aIniName = aIniName.copy( 0, lastIndex+1 );
aIniName += "perftune";
- #if defined(WNT)
+ #if defined(_WIN32)
aIniName += ".ini";
#else
aIniName += "rc";
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 7e62952..6794269 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -79,7 +79,7 @@
#include <queue>
#include <memory>
-#ifdef WNT
+#ifdef _WIN32
#if defined _MSC_VER
#pragma warning (push, 1)
#pragma warning (disable: 4005)
@@ -686,7 +686,7 @@ ExtensionCmdQueue::Thread::~Thread() {}
void ExtensionCmdQueue::Thread::execute()
{
-#ifdef WNT
+#ifdef _WIN32
//Needed for use of the service "com.sun.star.system.SystemShellExecute" in
//DialogHelper::openWebBrowser
CoUninitialize();
@@ -833,7 +833,7 @@ void ExtensionCmdQueue::Thread::execute()
currentCmdEnv->stopProgress();
}
//end for
-#ifdef WNT
+#ifdef _WIN32
CoUninitialize();
#endif
}
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 949d762..9930d6a 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -46,7 +46,7 @@
#include <comphelper/processfactory.hxx>
#include <salhelper/linkhelper.hxx>
-#ifdef WNT
+#ifdef _WIN32
#define UNICODE
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -55,7 +55,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#if defined WNT
+#if defined(_WIN32)
#define SOFFICE1 "soffice.exe"
#define SBASE "sbase.exe"
#define SCALC "scalc.exe"
@@ -467,7 +467,7 @@ Reference<XInterface> resolveUnoURL(
return nullptr; // warning C4715
}
-#ifdef WNT
+#ifdef _WIN32
void writeConsoleWithStream(OUString const & sText, HANDLE stream)
{
DWORD nWrittenChars = 0;
@@ -485,7 +485,7 @@ void writeConsoleWithStream(OUString const & sText, FILE * stream)
void writeConsole(OUString const & sText)
{
-#ifdef WNT
+#ifdef _WIN32
writeConsoleWithStream(sText, GetStdHandle(STD_OUTPUT_HANDLE));
#else
writeConsoleWithStream(sText, stdout);
@@ -494,7 +494,7 @@ void writeConsole(OUString const & sText)
void writeConsoleError(OUString const & sText)
{
-#ifdef WNT
+#ifdef _WIN32
writeConsoleWithStream(sText, GetStdHandle(STD_ERROR_HANDLE));
#else
writeConsoleWithStream(sText, stderr);
@@ -503,7 +503,7 @@ void writeConsoleError(OUString const & sText)
OUString readConsole()
{
-#ifdef WNT
+#ifdef _WIN32
sal_Unicode aBuffer[1024];
DWORD dwRead = 0;
//unopkg.com feeds unopkg.exe with wchar_t|s
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 197ce6a..f33cd70 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <time.h>
-#ifndef WNT
+#ifndef _WIN32
#include <unistd.h>
#else
#include <windows.h>
@@ -41,7 +41,7 @@ using namespace ::utl;
static OString impl_getHostname()
{
OString aHost;
-#ifdef WNT
+#ifdef _WIN32
/*
prevent windows from connecting to the net to get its own
hostname by using the netbios name
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 62d11c4..c0e0db7 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -340,7 +340,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(
-#ifdef WNT
+#ifdef _WIN32
"c:\\content.bmp",
#else
"~/content.bmp",
@@ -363,7 +363,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(
-#ifdef WNT
+#ifdef _WIN32
"c:\\transparence.bmp",
#else
"~/transparence.bmp",
@@ -384,7 +384,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(
-#ifdef WNT
+#ifdef _WIN32
"c:\\mask.bmp",
#else
"~/mask.bmp",
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 687ccf3..f83a4a1 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -51,7 +51,7 @@ class VerbExecutionController
sal_Int32 m_nNotificationLock;
-#ifdef WNT
+#ifdef _WIN32
bool m_bWasEverActive;
bool m_bVerbExecutionInProgress;
oslThreadIdentifier m_nVerbExecutionThreadIdentifier;
@@ -62,7 +62,7 @@ public:
VerbExecutionController()
: m_nNotificationLock( 0 )
-#ifdef WNT
+#ifdef _WIN32
, m_bWasEverActive( false )
, m_bVerbExecutionInProgress( false )
, m_nVerbExecutionThreadIdentifier( 0 )
@@ -70,7 +70,7 @@ public:
#endif
{}
-#ifdef WNT
+#ifdef _WIN32
void StartControlExecution();
sal_Bool EndControlExecution_WasModified();
void ModificationNotificationIsDone();
@@ -205,11 +205,11 @@ protected:
css::uno::Reference< css::io::XStream > GetNewFilledTempStream_Impl(
const css::uno::Reference< css::io::XInputStream >& xInStream )
throw( css::io::IOException, css::uno::RuntimeException );
-#ifdef WNT
+#ifdef _WIN32
void SwitchComponentToRunningState_Impl();
#endif
void MakeEventListenerNotification_Impl( const OUString& aEventName );
-#ifdef WNT
+#ifdef _WIN32
void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState );
css::uno::Reference< css::io::XOutputStream > GetStreamForSaving();
@@ -239,7 +239,7 @@ protected:
const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs,
bool bSaveAs )
throw ( css::uno::Exception );
-#ifdef WNT
+#ifdef _WIN32
void StoreObjectToStream( css::uno::Reference< css::io::XOutputStream > xOutStream )
throw ( css::uno::Exception );
#endif
@@ -262,7 +262,7 @@ protected:
const css::uno::Reference< css::io::XStream >& xStream,
bool bAllowRepair50 = false )
throw ();
-#ifdef WNT
+#ifdef _WIN32
sal_Bool SaveObject_Impl();
sal_Bool OnShowWindow_Impl( sal_Bool bShow );
void CreateOleComponent_Impl( OleComponent* pOleComponent = NULL );
@@ -289,14 +289,14 @@ public:
// factory can do it for OOo objects, but for OLE objects OS dependent code is required
OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
bool bLink );
-#ifdef WNT
+#ifdef _WIN32
// this constructor let object be initialized from clipboard
OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
#endif
virtual ~OleEmbeddedObject();
-#ifdef WNT
+#ifdef _WIN32
void OnIconChanged_Impl();
void OnViewChanged_Impl();
void OnClosed_Impl();
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index bf5d08c..473df89 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -52,13 +52,13 @@
#include "ownview.hxx"
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
using namespace ::com::sun::star;
-#ifdef WNT
+#ifdef _WIN32
void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
{
@@ -465,7 +465,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
if ( m_nObjectState == nNewState )
return;
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
if ( m_nTargetState != -1 )
@@ -615,7 +615,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
throw embed::WrongStateException( "The object has no persistence!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
if ( m_nObjectState == embed::EmbedStates::LOADED )
@@ -663,7 +663,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
namespace
{
-#ifndef WNT
+#ifndef _WIN32
bool lcl_CopyStream(uno::Reference<io::XInputStream> xIn, uno::Reference<io::XOutputStream> xOut)
{
const sal_Int32 nChunkSize = 4096;
@@ -689,7 +689,7 @@ namespace
OUString sUrl;
// the solution is only active for Unix systems
-#ifndef WNT
+#ifndef _WIN32
uno::Reference <beans::XPropertySet> xNativeTempFile(
io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY_THROW);
@@ -775,7 +775,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
throw embed::WrongStateException( "The object has no persistence!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
sal_Int32 nOldState = m_nObjectState;
@@ -907,7 +907,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
if ( m_nObjectState == -1 )
throw embed::WrongStateException( "The object has no persistence!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
// registry could be used in this case
@@ -1072,7 +1072,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
sal_Int64 nResult = 0;
-#ifdef WNT
+#ifdef _WIN32
if ( m_bGotStatus && m_nStatusAspect == nAspect )
nResult = m_nStatus;
else if ( m_pOleComponent )
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 25f5528..31d6f9c 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -33,7 +33,7 @@
#include "ownview.hxx"
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
@@ -104,7 +104,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_bTriedConversion( false )
{
}
-#ifdef WNT
+#ifdef _WIN32
// this constructor let object be initialized from clipboard
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
@@ -183,7 +183,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
}
}
}
-#ifdef WNT
+#ifdef _WIN32
void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
{
@@ -228,7 +228,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
void OleEmbeddedObject::GetRidOfComponent()
{
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED )
@@ -385,7 +385,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
static_cast< ::cppu::OWeakObject* >(this) );
}
-#if defined WNT
+#if defined(_WIN32)
if (m_pOleComponent != 0)
{
return uno::Reference< util::XCloseable >( static_cast< ::cppu::OWeakObject* >( m_pOleComponent ), uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 3fbf05a..fd705ae 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -47,7 +47,7 @@
#include <closepreventer.hxx>
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
@@ -154,7 +154,7 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
return aResult;
}
-#ifdef WNT
+#ifdef _WIN32
OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
throw( io::IOException, uno::RuntimeException )
{
@@ -207,7 +207,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
uno::makeAny( true ) );
}
-#ifdef WNT
+#ifdef _WIN32
void VerbExecutionController::StartControlExecution()
{
@@ -730,7 +730,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
m_aTempURL.clear();
}
-#ifdef WNT
+#ifdef _WIN32
// retry to create the component after recovering
GetRidOfComponent();
@@ -801,7 +801,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
SwitchOwnPersistence( xNewParentStorage, xNewOwnStream, aNewName );
}
-#ifdef WNT
+#ifdef _WIN32
sal_Bool OleEmbeddedObject::SaveObject_Impl()
{
@@ -1119,7 +1119,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
bool bStoreLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED
-#ifdef WNT
+#ifdef _WIN32
// if the object was NOT modified after storing it can be just copied
// as if it was in loaded state
|| ( m_pOleComponent && !m_pOleComponent->IsDirty() )
@@ -1159,7 +1159,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
bVisReplIsStored = HasVisReplInStream();
bStoreLoaded = true;
}
-#ifdef WNT
+#ifdef _WIN32
else if ( m_pOleComponent )
{
xTargetStream =
@@ -1358,7 +1358,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
-#ifdef WNT
+#ifdef _WIN32
sal_Int32 nStorageMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
#endif
@@ -1368,7 +1368,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
if ( lObjArgs[nInd].Name == "StoreVisualReplacement" )
lObjArgs[nInd].Value >>= m_bStoreVisRepl;
-#ifdef WNT
+#ifdef _WIN32
if ( nEntryConnectionMode == embed::EntryInitModes::DEFAULT_INIT )
{
if ( m_bFromClipboard )
@@ -1756,7 +1756,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
bool bStoreLoaded = true;
-#ifdef WNT
+#ifdef _WIN32
if ( m_nObjectState != embed::EmbedStates::LOADED && m_pOleComponent && m_pOleComponent->IsDirty() )
{
bStoreLoaded = sal_False;
@@ -1956,7 +1956,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
if ( m_pOleComponent )
{
// TODO: create an object based on the link
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index aa87776..2261015 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -23,7 +23,7 @@
#include "xolefactory.hxx"
-#if defined WNT
+#if defined(_WIN32)
#include "xdialogcreator.hxx"
#endif
@@ -50,7 +50,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
OleEmbeddedObjectFactory::impl_staticCreateSelfInstance,
OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
}
-#ifdef WNT
+#ifdef _WIN32
// the following service makes sense only on windows
else if ( aImplName.equals( MSOLEDialogObjectCreator::impl_staticGetImplementationName() ) )
{
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 5be4ed5..d53ef5f 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -30,7 +30,7 @@
#include <comphelper/seqstream.hxx>
#include <filter/msfilter/classids.hxx>
-#if defined WNT
+#if defined(_WIN32)
#include <olecomponent.hxx>
#endif
@@ -107,7 +107,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
throw embed::WrongStateException( "The object is not loaded!",
static_cast< ::cppu::OWeakObject* >(this) );
-#ifdef WNT
+#ifdef _WIN32
// RECOMPOSE_ON_RESIZE misc flag means that the object has to be switched to running state on resize.
// SetExtent() is called only for objects that require it,
// it should not be called for MSWord documents to workaround problem i49369
@@ -186,7 +186,7 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
awt::Size aResult;
-#ifdef WNT
+#ifdef _WIN32
// TODO/LATER: Support different aspects
if ( m_pOleComponent && !m_bHasSizeToSet && nAspect == embed::Aspects::MSOLE_CONTENT )
{
@@ -347,7 +347,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
{
return GetVisualRepresentationInNativeFormat_Impl( m_xCachedVisualRepresentation );
}
-#ifdef WNT
+#ifdef _WIN32
else if ( m_pOleComponent )
{
try
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 833bc6f..d92b8e7 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -39,7 +39,7 @@
#include <oleembobj.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <oledlg.h>
@@ -138,7 +138,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
embed::InsertedObjectInfo aObjectInfo;
uno::Sequence< beans::PropertyValue > aObjArgs( aInObjArgs );
-#ifdef WNT
+#ifdef _WIN32
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -289,7 +289,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
{
embed::InsertedObjectInfo aObjectInfo;
-#ifdef WNT
+#ifdef _WIN32
if ( !xStorage.is() )
throw lang::IllegalArgumentException( "No parent storage is provided!",
static_cast< ::cppu::OWeakObject* >(this),
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index adee0e8..dfd1adb 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
// property name to register own window procedure on hwnd
@@ -67,7 +67,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
JAWT awt ;
JAWT_DrawingSurface* ds ;
JAWT_DrawingSurfaceInfo* dsi ;
-#ifdef WNT
+#ifdef _WIN32
JAWT_Win32DrawingSurfaceInfo* dsi_win ;
#else
// FIXME: Where is dsi_x11 defined?
@@ -94,7 +94,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
dsi = ds->GetDrawingSurfaceInfo(ds);
/* Get the platform-specific drawing info */
-#ifdef WNT
+#ifdef _WIN32
dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
drawable = (jlong)dsi_win->hwnd;
#else
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 1a2a565..66b5f82 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -70,7 +70,7 @@ namespace abp
bool bHaveKab = false;
bool bHaveMacab = false;
-#if !defined WNT
+#if !defined(_WIN32)
Reference< XDriverManager2 > xManager = DriverManager::create( _pParent->getORB() );
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 206514c..3e03f2c 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -120,7 +120,7 @@ void LdapConnection::connectSimple()
#ifdef LDAP_X_OPT_CONNECT_TIMEOUT // OpenLDAP doesn't support this and the func
/* timeout is specified in milliseconds -> 4 seconds*/
int timeout = 4000;
-#ifdef WNT
+#ifdef _WIN32
ldap_set_optionW( mConnection,
LDAP_X_OPT_CONNECT_TIMEOUT,
&timeout );
@@ -132,7 +132,7 @@ void LdapConnection::connectSimple()
#endif
// Do the bind
-#ifdef WNT
+#ifdef _WIN32
LdapErrCode retCode = ldap_simple_bind_sW(mConnection,
(PWCHAR) mLdapDefinition.mAnonUser.getStr(),
(PWCHAR) mLdapDefinition.mAnonCredentials.getStr() );
@@ -159,7 +159,7 @@ void LdapConnection::initConnection()
if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT;
-#ifdef WNT
+#ifdef _WIN32
mConnection = ldap_initW((PWCHAR) mLdapDefinition.mServer.getStr(),
mLdapDefinition.mPort) ;
#else
@@ -189,7 +189,7 @@ void LdapConnection::initConnection()
OUString aUserDn =findUserDn( aUser );
LdapMessageHolder result;
-#ifdef WNT
+#ifdef _WIN32
LdapErrCode retCode = ldap_search_sW(mConnection,
(PWCHAR) aUserDn.getStr(),
LDAP_SCOPE_BASE,
@@ -209,7 +209,7 @@ void LdapConnection::initConnection()
checkLdapReturnCode("getUserProfile", retCode,mConnection) ;
BerElement * ptr;
-#ifdef WNT
+#ifdef _WIN32
PWCHAR attr = ldap_first_attributeW(mConnection, result.msg, &ptr);
while (attr) {
PWCHAR * values = ldap_get_valuesW(mConnection, result.msg, attr);
@@ -257,7 +257,7 @@ void LdapConnection::initConnection()
filter.append( mLdapDefinition.mUserUniqueAttr ).append("=").append(aUser).append("))") ;
LdapMessageHolder result;
-#ifdef WNT
+#ifdef _WIN32
PWCHAR attributes [2] = { const_cast<PWCHAR>( L"1.1" ), NULL };
LdapErrCode retCode = ldap_search_sW(mConnection,
(PWCHAR) mLdapDefinition.mBaseDN.getStr(),
@@ -276,7 +276,7 @@ void LdapConnection::initConnection()
if (entry != nullptr)
{
-#ifdef WNT
+#ifdef _WIN32
PWCHAR charsDn = ldap_get_dnW(mConnection, entry) ;
userDn = OUString( reinterpret_cast<const sal_Unicode*>( charsDn ) );
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index d8fe63c..ca206ac 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -24,7 +24,7 @@
#include <map>
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#include <winldap.h>
#else // !defined WNT
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 4c8858f..009fec2 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
-#if defined WNT
+#if defined(_WIN32)
#define TWAIN_LIBNAME "TWAIN_32.DLL"
#define TWAIN_FUNCNAME "DSM_Entry"
#endif
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index bb485b5..e2046f9 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -18,7 +18,7 @@
*/
-#if defined WNT
+#if defined(_WIN32)
# ifdef _MSC_VER
# pragma warning(push, 1) /* disable warnings within system headers */
# endif
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 0a813fc..74221ea 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -42,7 +42,7 @@
#include <osl/file.hxx>
#include <sal/macros.h>
-#ifdef WNT
+#ifdef _WIN32
#ifdef _MSC_VER
#pragma warning(push,1) // disable warnings within system headers
//#pragma warning(disable: 4917)
@@ -70,7 +70,7 @@ namespace uno = com::sun::star::uno ;
#define PROPERTY_CLICK_HDL "MenuClickHDL"
#define PROPERTY_SHOW_MENUICON "MenuIconVisible"
-#if defined WNT
+#if defined(_WIN32)
extern "C" bool SAL_CALL WNT_hasInternetConnection();
#endif
@@ -124,7 +124,7 @@ inline bool isObsoleteUpdateInfo(const OUString& rBuildId)
OUString getImageFromFileName(const OUString& aFile)
{
-#ifndef WNT
+#ifndef _WIN32
OUString aUnpackPath;
if( osl_getExecutableFile(&aUnpackPath.pData) == osl_Process_E_None )
{
@@ -247,7 +247,7 @@ private:
/* Used to avoid dialup login windows (on platforms we know how to double this) */
static inline bool hasInternetConnection()
{
-#ifdef WNT
+#ifdef _WIN32
return WNT_hasInternetConnection();
#else
return true;
@@ -604,7 +604,7 @@ DownloadThread::run()
{
osl_setThreadName("DownloadThread");
-#ifdef WNT
+#ifdef _WIN32
CoUninitialize();
CoInitialize( NULL );
#endif
@@ -1461,7 +1461,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL)
sal_uInt64 nWritten = 0;
OUString aURL( rURL );
-#ifdef WNT
+#ifdef _WIN32
rc = aFile.write( aLineBuf.getStr(), aLineBuf.getLength(), nWritten );
if ( rc != osl::FileBase::E_None ) return false;
aURL = "URL=" + rURL;
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 60aa6a7..4392cbf 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -29,7 +29,7 @@
#include <osl/file.hxx>
#include <sal/macros.h>
-#ifdef WNT
+#ifdef _WIN32
#ifdef _MSC_VER
#pragma warning(push,1) // disable warnings within system headers
#pragma warning(disable: 4917)
@@ -164,7 +164,7 @@ OUString UpdateCheckConfig::getDesktopDirectory()
{
OUString aRet;
-#ifdef WNT
+#ifdef _WIN32
WCHAR szPath[MAX_PATH];
if (TRUE == SHGetSpecialFolderPathW(nullptr, szPath, CSIDL_DESKTOPDIRECTORY, true))
@@ -191,7 +191,7 @@ OUString UpdateCheckConfig::getAllUsersDirectory()
{
OUString aRet;
-#ifdef WNT
+#ifdef _WIN32
WCHAR szPath[MAX_PATH];
if (TRUE == SHGetSpecialFolderPathW(nullptr, szPath, CSIDL_COMMON_DOCUMENTS, true))
diff --git a/external/jpeg/configs/jconfig.h b/external/jpeg/configs/jconfig.h
index 0c43051..1ac8ea9 100644
--- a/external/jpeg/configs/jconfig.h
+++ b/external/jpeg/configs/jconfig.h
@@ -35,7 +35,7 @@ typedef unsigned char boolean;
#ifdef JPEG_INTERNALS
/* #undef RIGHT_SHIFT_IS_UNSIGNED */
-#ifdef WNT
+#ifdef _WIN32
#define INLINE __inline
#elif defined SOLARIS
#define INLINE
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index a111a99..72d93e7 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -150,7 +150,7 @@ static oslProcessError runProcessWithPathSearch(const OUString &rProgName,
{
oslProcessError result;
oslSecurity pSecurity = osl_getCurrentSecurity();
-#ifdef WNT
+#ifdef _WIN32
/*
* ooo#72096
* On Window the underlying SearchPath searches in order of...
@@ -185,7 +185,7 @@ static oslProcessError runProcessWithPathSearch(const OUString &rProgName,
return result;
}
-#if defined(WNT)
+#if defined(_WIN32)
# define EXESUFFIX ".exe"
#else
# define EXESUFFIX ""
@@ -382,7 +382,7 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
arg11.pData
};
return RenderAsBMPThroughHelper(pBuf, nBytesRead, rGraphic,
-#ifdef WNT
+#ifdef _WIN32
"gswin32c" EXESUFFIX,
#else
"gs" EXESUFFIX,
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6ca8d57..a8bcecf 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2322,7 +2322,7 @@ bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilt
if ( nPathTokenPos == -1 )
{
OUString aDelim(
-#if defined(WNT)
+#if defined(_WIN32)
'\\'
#else
'/'
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index 81c938d..eb99975 100644
--- a/framework/source/fwi/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
@@ -19,7 +19,7 @@
#include <helper/networkdomain.hxx>
-#ifdef WNT
+#ifdef _WIN32
// Windows
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 99d8b56..4977e97 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -152,7 +152,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
sDesktopName = "Base";
else
sDesktopName = "Startcenter";
-#if defined(WNT)
+#if defined(_WIN32)
// We use a hardcoded product name matching the registry keys so applications can be associated with file types
sApplicationID = "TheDocumentFoundation.LibreOffice.";
sApplicationID += sDesktopName;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 4305976..19b324d 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -462,7 +462,7 @@ OUString SpinfieldToolbarController::impl_formatOutputString( double fValue )
}
else
{
-#ifdef WNT
+#ifdef _WIN32
sal_Unicode aBuffer[128];
aBuffer[0] = 0;
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index b3e3251..78f98a2 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -87,7 +87,7 @@ namespace fs
HCDBG(std::cerr << "native_file_string is " << tmp.getStr() << std::endl);
return std::string(tmp.getStr());
}
-#ifdef WNT
+#ifdef _WIN32
wchar_t const * native_file_string_w() const
{
OUString ustrSystemPath;
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 276394a..2a127fe 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -87,7 +87,7 @@ xmlDocPtr HelpCompiler::compactXhpForJar( xmlDocPtr doc )
void HelpCompiler::saveXhpForJar( xmlDocPtr doc, const fs::path &filePath )
{
//save processed xhp document in ziptmp<module>_<lang>/text directory
-#ifdef WNT
+#ifdef _WIN32
std::string pathSep = "\\";
#else
std::string pathSep = "/";
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 626357d..95821f1 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -87,7 +87,7 @@ void IndexerPreProcessor::processDocument
if( pResNodeCaption )
{
fs::path fsCaptionPureTextFile_docURL = m_fsCaptionFilesDirName / aStdStr_EncodedDocPathURL;
-#ifdef WNT //We need _wfopen to support long file paths on Windows XP
+#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP
FILE* pFile_docURL = _wfopen(
fsCaptionPureTextFile_docURL.native_file_string_w(), L"w" );
#else
@@ -110,7 +110,7 @@ void IndexerPreProcessor::processDocument
if( pResNodeContent )
{
fs::path fsContentPureTextFile_docURL = m_fsContentFilesDirName / aStdStr_EncodedDocPathURL;
-#ifdef WNT //We need _wfopen to support long file paths on Windows XP
+#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP
FILE* pFile_docURL = _wfopen(
fsContentPureTextFile_docURL.native_file_string_w(), L"w" );
#else
@@ -186,7 +186,7 @@ public:
void dump_DBHelp( const fs::path& rFileName )
{
-#ifdef WNT //We need _wfopen to support long file paths on Windows XP
+#ifdef _WIN32 //We need _wfopen to support long file paths on Windows XP
FILE* pFile = _wfopen( rFileName.native_file_string_w(), L"wb" );
#else
FILE* pFile = fopen( rFileName.native_file_string().c_str(), "wb" );
@@ -303,7 +303,7 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
bUse_ = false;
fs::path helpTextFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".ht_" : ".ht")));
-#ifdef WNT
+#ifdef _WIN32
//We need _wfopen to support long file paths on Windows XP
FILE* pFileHelpText_DBHelp = _wfopen
( helpTextFileName_DBHelp.native_file_string_w(), L"wb" );
@@ -314,7 +314,7 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
#endif
fs::path dbBaseFileName_DBHelp(indexDirParentName / (mod + (bUse_ ? ".db_" : ".db")));
-#ifdef WNT
+#ifdef _WIN32
//We need _wfopen to support long file paths on Windows XP
FILE* pFileDbBase_DBHelp = _wfopen
( dbBaseFileName_DBHelp.native_file_string_w(), L"wb" );
diff --git a/i18nlangtag/source/isolang/insys.cxx b/i18nlangtag/source/isolang/insys.cxx
index a0f1ab4..e6b58b5 100644
--- a/i18nlangtag/source/isolang/insys.cxx
+++ b/i18nlangtag/source/isolang/insys.cxx
@@ -18,7 +18,7 @@
*/
-#if defined( WNT )
+#if defined(_WIN32)
#include "inwnt.cxx"
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 229e5b4..e430f1c 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -27,7 +27,7 @@
#include "rtl/ustring.hxx"
#include "osl/file.hxx"
-#ifdef WNT
+#ifdef _WIN32
# include <windows.h>
#endif
@@ -191,7 +191,7 @@ bool Options::setOption(char const * option, std::string const & rArg)
return result;
}
-#ifdef WNT
+#ifdef _WIN32
/* Helper functiopn to convert windows paths including spaces, brackets etc. into
a windows short Url. The ucpp preprocessor has problems with such paths and returns
with error.
@@ -270,7 +270,7 @@ bool Options::initOptions(std::vector< std::string > & rArgs) throw(IllegalArgum
if (!buffer.isEmpty())
buffer.append(' ');
// buffer.append("-I\"");
-#ifdef WNT
+#ifdef _WIN32
OString incpath = convertIncPathtoShortWindowsPath(param.getToken(0, ';', k));
#else
OString incpath = param.getToken(0, ';', k);
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index 81948c7..88ac1fc 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 40ded29..5ce6d87 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 85da298..0b26f9a 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 e7ad069..17e27e3 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 30895b6..5ef6322 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 ed618d9..58738f6 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 5baabf4..2a8bb22 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 47f8042..90c536e 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 2682d5d2..165d8b5 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 ddb9852..3fa5cc0 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 e349024..e503f38 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 e45c8f0..7dcc844 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 a090c55..40ea017 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 932bb9c..537cb8f 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 18f3939..4951198 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
diff --git a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index 6cdb2d1..b187bd9 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -103,7 +103,7 @@ static rtl_uString * jstring2ustring(JNIEnv * env, jstring jstr)
* Signature: (Lcom/sun/star/beans/NativeService;)V
*/
SAL_DLLPUBLIC_EXPORT void
-#if defined WNT
+#if defined(_WIN32)
PipeConnection_create
#else
JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
@@ -242,7 +242,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_createJNI
* Signature: ()V
*/
SAL_DLLPUBLIC_EXPORT void
-#if defined WNT
+#if defined(_WIN32)
PipeConnection_close
#else
JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_closeJNI
@@ -328,7 +328,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_closeJNI
* Signature: ([[BI)I
*/
SAL_DLLPUBLIC_EXPORT jint
-#if defined WNT
+#if defined(_WIN32)
PipeConnection_read
#else
JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
@@ -449,7 +449,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_readJNI
* Signature: ([B)V
*/
SAL_DLLPUBLIC_EXPORT void
-#if defined WNT
+#if defined(_WIN32)
PipeConnection_write
#else
JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
@@ -546,7 +546,7 @@ JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_writeJNI
* Signature: ()V
*/
SAL_DLLPUBLIC_EXPORT void
-#if defined WNT
+#if defined(_WIN32)
PipeConnection_flush
#else
JNICALL Java_com_sun_star_lib_connections_pipe_PipeConnection_flushJNI
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 7cc13ce..1de6afd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -36,7 +36,7 @@ Reference<VendorBase> OtherInfo::createInstance()
char const* const* OtherInfo::getJavaExePaths(int * size)
{
static char const * ar[] = {
-#if defined(WNT)
+#if defined(_WIN32)
"bin/java.exe",
"jre/bin/java.exe"
#elif defined UNX
@@ -51,7 +51,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size)
char const* const* OtherInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#if defined(WNT)
+#if defined(_WIN32)
"/bin/client/jvm.dll",
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll",
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 667b287..89e1a49 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -18,7 +18,7 @@
*/
-#ifdef WNT
+#ifdef _WIN32
# include <stdio.h>
# include <sys/stat.h>
# include <windows.h>
@@ -497,7 +497,7 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
}
-#if defined(WNT)
+#if defined(_WIN32)
// Load msvcr71.dll using an explicit full path from where it is
// present as bundled with the JRE. In case it is not found where we
@@ -677,7 +677,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
#if defined(LINUX)
if (!moduleRt.load(sRuntimeLib, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW))
#else
-#if defined(WNT)
+#if defined(_WIN32)
do_msvcr_magic(sRuntimeLib.pData);
#endif
if (!moduleRt.load(sRuntimeLib))
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 29953a6..7f7c494 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -36,7 +36,7 @@ rtl::Reference<VendorBase> SunInfo::createInstance()
char const* const* SunInfo::getJavaExePaths(int * size)
{
static char const * ar[] = {
-#if defined(WNT)
+#if defined(_WIN32)
"java.exe",
"bin/java.exe",
"jre/bin/java.exe"
@@ -53,7 +53,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
char const* const* SunInfo::getRuntimePaths(int * size)
{
static char const* ar[]= {
-#if defined(WNT)
+#if defined(_WIN32)
"/bin/client/jvm.dll",
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll",
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index b60b14d..4cf1871 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -40,7 +40,7 @@
#include <algorithm>
#include <map>
-#if defined WNT
+#if defined(_WIN32)
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
@@ -63,7 +63,7 @@ using namespace std;
using ::rtl::Reference;
-#ifdef WNT
+#ifdef _WIN32
#define HKEY_SUN_JRE L"Software\\JavaSoft\\Java Runtime Environment"
#define HKEY_SUN_SDK L"Software\\JavaSoft\\Java Development Kit"
#endif
@@ -119,7 +119,7 @@ namespace jfw_plugin
{
extern VendorSupportMapEntry gVendorMap[];
-#if defined WNT
+#if defined(_WIN32)
bool getSDKInfoFromRegistry(vector<OUString> & vecHome);
bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
#endif
@@ -573,7 +573,7 @@ bool decodeOutput(const OString& s, OUString* out)
}
-#if defined WNT
+#if defined(_WIN32)
void addJavaInfoFromWinReg(
std::vector<rtl::Reference<VendorBase> > & allInfos,
std::vector<rtl::Reference<VendorBase> > & addedInfos)
@@ -800,7 +800,7 @@ vector<Reference<VendorBase> > addAllJREInfos(
{
vector<Reference<VendorBase> > addedInfos;
-#if defined WNT
+#if defined(_WIN32)
// Get Javas from the registry
addJavaInfoFromWinReg(allInfos, addedInfos);
#endif // WNT
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index d84b52a..3e9f478 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -1060,7 +1060,7 @@ JavaInfo * MergedSettings::createJavaInfo() const
{
return m_javaInfo.makeJavaInfo();
}
-#ifdef WNT
+#ifdef _WIN32
bool MergedSettings::getJavaInfoAttrAutoSelect() const
{
return m_javaInfo.bAutoSelect;
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 7d45791..21f48ba 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -300,7 +300,7 @@ public:
*/
OString const & getJavaInfoAttrVendorUpdate() const { return m_javaInfo.sAttrVendorUpdate;}
-#ifdef WNT
+#ifdef _WIN32
/** returns the javaInfo at autoSelect attribute.
Before calling this function loadFromSettings must be called.
It uses the javaInfo at autoSelect attribute to determine
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index eb16743..4126943 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -233,7 +233,7 @@ javaFrameworkError SAL_CALL jfw_startVM(
if (aInfo == nullptr)
return JFW_E_NO_SELECT;
-#ifdef WNT
+#ifdef _WIN32
//Because on Windows there is no system setting that we can use to determine
//if Assistive Technology Tool support is needed, we ship a .reg file that the
//user can use to create a registry setting. When the user forgets to set
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 53e74b2..591a12a 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -18,7 +18,7 @@
*/
-#if defined WNT
+#if defined(_WIN32)
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
@@ -61,7 +61,7 @@ bool isAccessibilitySupportDesired()
sValue == "1" )
return false;
-#ifdef WNT
+#ifdef _WIN32
bool retVal = false;
HKEY hKey = 0;
if (RegOpenKeyEx(HKEY_CURRENT_USER,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index fec3f67..c9f0b8b 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -36,7 +36,7 @@
#include <queue>
#include <string>
-#ifdef WNT
+#ifdef _WIN32
#include <direct.h>
#else
#include <unistd.h>
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 0a32b7b..c5fda05 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -35,7 +35,7 @@
#include <iostream>
#include <vector>
#include <rtl/strbuf.hxx>
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#undef CopyFile
#include <direct.h>
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 5f2c768..4f784ca 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(WNT)
+#if defined(_WIN32)
#include <prewin.h>
#include <postwin.h>
#endif
@@ -290,7 +290,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath );
-#if defined(WNT)
+#if defined(_WIN32)
// Hyphen waits UTF-8 encoded paths with \\?\ long path prefix.
OString sTmp = Win_AddLongPathPrefix(OUStringToOString(dictpath, RTL_TEXTENCODING_UTF8));
#else
@@ -511,7 +511,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
return nullptr;
}
-#if defined(WNT)
+#if defined(_WIN32)
static OString Win_GetShortPathName( const OUString &rLongPathName )
{
OString aRes;
@@ -572,7 +572,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath );
OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) );
-#if defined(WNT)
+#if defined(_WIN32)
// workaround for Windows specific problem that the
// path length in calls to 'fopen' is limited to somewhat
// about 120+ characters which will usually be exceed when
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 2ccea80..c1df022 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -122,7 +122,7 @@ void LangGuess_Impl::EnsureInitialized()
OUString aPhysPath;
OUString aURL( SvtPathOptions().GetFingerprintPath() );
osl::FileBase::getSystemPathFromFileURL( aURL, aPhysPath );
-#ifdef WNT
+#ifdef _WIN32
aPhysPath += "\\";
#else
aPhysPath += "/";
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index d0da501..e187ad5 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(WNT)
+#if defined(_WIN32)
#include <windows.h>
#endif
@@ -45,7 +45,7 @@
using ::com::sun::star::lang::Locale;
using namespace ::com::sun::star;
-#if defined(WNT)
+#if defined(_WIN32)
OString Win_AddLongPathPrefix( const OString &rPathName )
{
#define WIN32_LONG_PATH_PREFIX "\\\\?\\"
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index a6d3962..299762d 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -41,7 +41,7 @@ struct lt_rtl_OUString
}
};
-#if defined(WNT)
+#if defined(_WIN32)
// to be use to get a path name with long path prefix
// under Windows for Hunspell, Hyphen and MyThes libraries
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 51166e6..e5c6a3d 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -321,7 +321,7 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rL
OUString aff;
osl::FileBase::getSystemPathFromFileURL(dicpath,dict);
osl::FileBase::getSystemPathFromFileURL(affpath,aff);
-#if defined(WNT)
+#if defined(_WIN32)
// workaround for Windows specific problem that the
// path length in calls to 'fopen' is limited to somewhat
// about 120+ characters which will usually be exceed when
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 3365b69..4bbd7a0 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -329,7 +329,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM
osl::FileBase::getSystemPathFromFileURL(datpath,ndat);
osl::FileBase::getSystemPathFromFileURL(idxpath,nidx);
-#if defined(WNT)
+#if defined(_WIN32)
// MyThes waits UTF-8 encoded paths with \\?\ long path prefix.
OString aTmpidx = Win_AddLongPathPrefix(OUStringToOString(nidx, RTL_TEXTENCODING_UTF8));
OString aTmpdat = Win_AddLongPathPrefix(OUStringToOString(ndat, RTL_TEXTENCODING_UTF8));
diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index 5f22d85..d48abe0 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -16,14 +16,14 @@ $(call gb_CustomTarget_get_target,odk/allheaders) : \
define odk_genincludesheader
// Generated list of sal includes
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#endif
endef
define odk_geninclude
-$(if $(2),#ifdef WNT)
+$(if $(2),#ifdef _WIN32)
#include <$(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(1))>
$(if $(2),#endif)
@@ -35,11 +35,11 @@ $(odk_allheaders_DIR)/allheaders.hxx : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
printf '// Generated list of sal includes\n' > $@ && \
- printf '#ifdef WNT\n' >> $@ && \
+ printf '#ifdef _WIN32\n' >> $@ && \
printf '#include <windows.h>\n' >> $@ && \
printf '#endif\n' >> $@ \
$(foreach file,$(shell cat $^),\
- $(if $(findstring /win32/,$(file)),&& printf '#ifdef WNT\n' >> $@) \
+ $(if $(findstring /win32/,$(file)),&& printf '#ifdef _WIN32\n' >> $@) \
&& printf '#include <%s>\n' $(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(file)) >> $@ \
$(if $(findstring /win32/,$(file)),&& printf '#endif // WNT\n' >> $@) \
)
diff --git a/onlineupdate/source/libmar/sign/mar_sign.c b/onlineupdate/source/libmar/sign/mar_sign.c
index 68bff67..a8e0f306 100644
--- a/onlineupdate/source/libmar/sign/mar_sign.c
+++ b/onlineupdate/source/libmar/sign/mar_sign.c
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifdef WNT
+#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
@@ -17,7 +17,7 @@
#include "mar_cmdline.h"
#include "mar.h"
#include "cryptox.h"
-#ifndef WNT
+#ifndef _WIN32
#include <unistd.h>
#endif
diff --git a/onlineupdate/source/libmar/sign/nss_secutil.c b/onlineupdate/source/libmar/sign/nss_secutil.c
index 2fa53e7..9fe5fe4 100644
--- a/onlineupdate/source/libmar/sign/nss_secutil.c
+++ b/onlineupdate/source/libmar/sign/nss_secutil.c
@@ -8,7 +8,7 @@
#include "nss_secutil.h"
#include "prprf.h"
-#ifdef WNT
+#ifdef _WIN32
#include <io.h>
#else
#include <unistd.h>
diff --git a/onlineupdate/source/libmar/src/mar.h b/onlineupdate/source/libmar/src/mar.h
index 31cc393..0e21efb 100644
--- a/onlineupdate/source/libmar/src/mar.h
+++ b/onlineupdate/source/libmar/src/mar.h
@@ -69,7 +69,7 @@ typedef int (* MarItemCallback)(MarFile *mar, const MarItem *item, void *data);
*/
MarFile *mar_open(const char *path);
-#ifdef WNT
+#ifdef _WIN32
MarFile *mar_wopen(const wchar_t *path);
#endif
diff --git a/onlineupdate/source/libmar/src/mar_create.c b/onlineupdate/source/libmar/src/mar_create.c
index c874b44..4e4e2b4 100644
--- a/onlineupdate/source/libmar/src/mar_create.c
+++ b/onlineupdate/source/libmar/src/mar_create.c
@@ -13,7 +13,7 @@
#include "mar_cmdline.h"
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
#include <winsock2.h>
#else
#include <netinet/in.h>
diff --git a/onlineupdate/source/libmar/src/mar_extract.c b/onlineupdate/source/libmar/src/mar_extract.c
index af22766..75cbd64 100644
--- a/onlineupdate/source/libmar/src/mar_extract.c
+++ b/onlineupdate/source/libmar/src/mar_extract.c
@@ -12,7 +12,7 @@
#include "mar_private.h"
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
#include <io.h>
#include <direct.h>
#endif
@@ -25,7 +25,7 @@ static int mar_ensure_parent_dir(const char *path)
{
*slash = '\0';
mar_ensure_parent_dir(path);
-#ifdef WNT
+#ifdef _WIN32
_mkdir(path);
#else
mkdir(path, 0755);
@@ -45,7 +45,7 @@ static int mar_test_callback(MarFile *mar, const MarItem *item, void *unused) {
if (mar_ensure_parent_dir(item->name))
return -1;
-#ifdef WNT
+#ifdef _WIN32
fd = _open(item->name, _O_BINARY|_O_CREAT|_O_TRUNC|_O_WRONLY, item->flags);
#else
fd = creat(item->name, item->flags);
diff --git a/onlineupdate/source/libmar/src/mar_private.h b/onlineupdate/source/libmar/src/mar_private.h
index 39a77d1..a770998 100644
--- a/onlineupdate/source/libmar/src/mar_private.h
+++ b/onlineupdate/source/libmar/src/mar_private.h
@@ -53,7 +53,7 @@ MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
/* The mar program is compiled as a host bin so we don't have access to NSPR at
runtime. For that reason we use ntohl, htonl, and define HOST_TO_NETWORK64
instead of the NSPR equivalents. */
-#ifdef WNT
+#ifdef _WIN32
#include <winsock2.h>
#define ftello _ftelli64
#define fseeko _fseeki64
diff --git a/onlineupdate/source/libmar/src/mar_read.c b/onlineupdate/source/libmar/src/mar_read.c
index 34f8e80..0ed8c6b 100644
--- a/onlineupdate/source/libmar/src/mar_read.c
+++ b/onlineupdate/source/libmar/src/mar_read.c
@@ -11,7 +11,7 @@
#include "mar_private.h"
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
#include <winsock2.h>
#else
#include <netinet/in.h>
@@ -177,7 +177,7 @@ MarFile *mar_open(const char *path) {
return mar_fpopen(fp);
}
-#ifdef WNT
+#ifdef _WIN32
MarFile *mar_wopen(const wchar_t *path) {
FILE *fp;
diff --git a/onlineupdate/source/libmar/tool/mar.c b/onlineupdate/source/libmar/tool/mar.c
index 8fb1666..dadb8d2 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -10,7 +10,7 @@
#include "mar.h"
#include "mar_cmdline.h"
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#include <direct.h>
#define chdir _chdir
@@ -23,7 +23,7 @@
#define MAR_CHANNEL_ID "LOOnlineUpdater" /* Dummy value; replace or
remove in the future */
-#if !defined(NO_SIGN_VERIFY) && (!defined(WNT) || defined(MAR_NSS))
+#if !defined(NO_SIGN_VERIFY) && (!defined(_WIN32) || defined(MAR_NSS))
#include "cert.h"
#include "pk11pub.h"
int NSSInitCryptoContext(const char *NSSConfigDir);
@@ -66,7 +66,7 @@ static void print_usage(void) {
"signed_input_archive.mar base_64_encoded_signature_file "
"changed_signed_output.mar\n");
printf("(i) is the index of the certificate to extract\n");
-#if defined(MACOSX) || (defined(WNT) && !defined(MAR_NSS))
+#if defined(MACOSX) || (defined(_WIN32) && !defined(MAR_NSS))
printf("Verify a MAR file:\n");
printf(" mar [-C workingDir] -D DERFilePath -v signed_archive.mar\n");
printf("At most %d signature certificate DER files are specified by "
@@ -135,16 +135,16 @@ int main(int argc, char **argv) {
uint32_t fileSizes[MAX_SIGNATURES];
const uint8_t* certBuffers[MAX_SIGNATURES];
char* DERFilePaths[MAX_SIGNATURES];
-#if (!defined(WNT) && !defined(MACOSX)) || defined(MAR_NSS)
+#if (!defined(_WIN32) && !defined(MACOSX)) || defined(MAR_NSS)
CERTCertificate* certs[MAX_SIGNATURES];
#endif
#endif
memset((void*)certNames, 0, sizeof(certNames));
-#if defined(WNT) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY)
+#if defined(_WIN32) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY)
memset((void*)certBuffers, 0, sizeof(certBuffers));
#endif
-#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(WNT)) || \
+#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(_WIN32)) || \
defined(MACOSX))
memset(DERFilePaths, 0, sizeof(DERFilePaths));
memset(fileSizes, 0, sizeof(fileSizes));
@@ -174,7 +174,7 @@ int main(int argc, char **argv) {
argv += 2;
argc -= 2;
}
-#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(WNT)) || \
+#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(_WIN32)) || \
defined(MACOSX))
/* -D DERFilePath, also matches -D[index] DERFilePath
We allow an index for verifying to be symmetric
@@ -333,7 +333,7 @@ int main(int argc, char **argv) {
return -1;
}
-#if (!defined(WNT) && !defined(MACOSX)) || defined(MAR_NSS)
+#if (!defined(_WIN32) && !defined(MACOSX)) || defined(MAR_NSS)
if (!NSSConfigDir || certCount == 0) {
print_usage();
return -1;
@@ -347,7 +347,7 @@ int main(int argc, char **argv) {
rv = 0;
for (k = 0; k < certCount; ++k) {
-#if (defined(WNT) || defined(MACOSX)) && !defined(MAR_NSS)
+#if (defined(_WIN32) || defined(MACOSX)) && !defined(MAR_NSS)
rv = mar_read_entire_file(DERFilePaths[k], MAR_MAX_CERT_SIZE,
&certBuffers[k], &fileSizes[k]);
#else
@@ -384,7 +384,7 @@ int main(int argc, char **argv) {
}
}
for (k = 0; k < certCount; ++k) {
-#if (defined(WNT) || defined(MACOSX)) && !defined(MAR_NSS)
+#if (defined(_WIN32) || defined(MACOSX)) && !defined(MAR_NSS)
free((void*)certBuffers[k]);
#else
/* certBuffers[k] is owned by certs[k] so don't free it */
diff --git a/onlineupdate/source/libmar/verify/cryptox.c b/onlineupdate/source/libmar/verify/cryptox.c
index c5bef73..0e17f77 100644
--- a/onlineupdate/source/libmar/verify/cryptox.c
+++ b/onlineupdate/source/libmar/verify/cryptox.c
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifdef WNT
+#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
diff --git a/onlineupdate/source/libmar/verify/mar_verify.c b/onlineupdate/source/libmar/verify/mar_verify.c
index ff0909a..74eb369 100644
--- a/onlineupdate/source/libmar/verify/mar_verify.c
+++ b/onlineupdate/source/libmar/verify/mar_verify.c
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifdef WNT
+#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
diff --git a/onlineupdate/source/update/common/pathhash.cxx b/onlineupdate/source/update/common/pathhash.cxx
index fea123c..aa5644c 100644
--- a/onlineupdate/source/update/common/pathhash.cxx
+++ b/onlineupdate/source/update/common/pathhash.cxx
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#include <wincrypt.h>
#include "pathhash.h"
diff --git a/onlineupdate/source/update/common/readstrings.cxx b/onlineupdate/source/update/common/readstrings.cxx
index 83580a8..d279211 100644
--- a/onlineupdate/source/update/common/readstrings.cxx
+++ b/onlineupdate/source/update/common/readstrings.cxx
@@ -10,7 +10,7 @@
#include "readstrings.h"
#include "errors.h"
-#ifdef WNT
+#ifdef _WIN32
# define NS_tfopen _wfopen
# define OPEN_MODE L"rb"
#else
diff --git a/onlineupdate/source/update/common/readstrings.h b/onlineupdate/source/update/common/readstrings.h
index ecef9aa..5b3cde6 100644
--- a/onlineupdate/source/update/common/readstrings.h
+++ b/onlineupdate/source/update/common/readstrings.h
@@ -9,7 +9,7 @@
#define MAX_TEXT_LEN 600
-#ifdef WNT
+#ifdef _WIN32
# define UNICODE
# include <windows.h>
typedef WCHAR NS_tchar;
diff --git a/onlineupdate/source/update/common/uachelper.cxx b/onlineupdate/source/update/common/uachelper.cxx
index 55053f3..4cae3ad 100644
--- a/onlineupdate/source/update/common/uachelper.cxx
+++ b/onlineupdate/source/update/common/uachelper.cxx
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
#include <wtsapi32.h>
#include "uachelper.h"
diff --git a/onlineupdate/source/update/common/updatedefines.h b/onlineupdate/source/update/common/updatedefines.h
index db45533..52a8b84 100644
--- a/onlineupdate/source/update/common/updatedefines.h
+++ b/onlineupdate/source/update/common/updatedefines.h
@@ -21,7 +21,7 @@
# endif
#endif
-#if defined(WNT)
+#if defined(_WIN32)
# include <windows.h>
# include <shlwapi.h>
# include <direct.h>
diff --git a/onlineupdate/source/update/common/updatehelper.cxx b/onlineupdate/source/update/common/updatehelper.cxx
index 1768e53..c10ea8d 100644
--- a/onlineupdate/source/update/common/updatehelper.cxx
+++ b/onlineupdate/source/update/common/updatehelper.cxx
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
// Needed for CreateToolhelp32Snapshot
diff --git a/onlineupdate/source/update/common/updatelogging.cxx b/onlineupdate/source/update/common/updatelogging.cxx
index 2f1472e..22a74e1 100644
--- a/onlineupdate/source/update/common/updatelogging.cxx
+++ b/onlineupdate/source/update/common/updatelogging.cxx
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#if defined(WNT)
+#if defined(_WIN32)
#include <windows.h>
#endif
diff --git a/onlineupdate/source/update/common/win_dirent.h b/onlineupdate/source/update/common/win_dirent.h
index a1c79d6..a228155 100644
--- a/onlineupdate/source/update/common/win_dirent.h
+++ b/onlineupdate/source/update/common/win_dirent.h
@@ -6,7 +6,7 @@
#ifndef WINDIRENT_H__
#define WINDIRENT_H__
-#ifdef WNT
+#ifdef _WIN32
#include <windows.h>
struct DIR {
diff --git a/onlineupdate/source/update/src/mar.h b/onlineupdate/source/update/src/mar.h
index 31cc393..0e21efb 100644
--- a/onlineupdate/source/update/src/mar.h
+++ b/onlineupdate/source/update/src/mar.h
@@ -69,7 +69,7 @@ typedef int (* MarItemCallback)(MarFile *mar, const MarItem *item, void *data);
*/
MarFile *mar_open(const char *path);
-#ifdef WNT
+#ifdef _WIN32
MarFile *mar_wopen(const wchar_t *path);
#endif
diff --git a/onlineupdate/source/update/src/mar_create.c b/onlineupdate/source/update/src/mar_create.c
index c874b44..4e4e2b4 100644
--- a/onlineupdate/source/update/src/mar_create.c
+++ b/onlineupdate/source/update/src/mar_create.c
@@ -13,7 +13,7 @@
#include "mar_cmdline.h"
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
#include <winsock2.h>
#else
#include <netinet/in.h>
diff --git a/onlineupdate/source/update/src/mar_extract.c b/onlineupdate/source/update/src/mar_extract.c
index af22766..75cbd64 100644
--- a/onlineupdate/source/update/src/mar_extract.c
+++ b/onlineupdate/source/update/src/mar_extract.c
@@ -12,7 +12,7 @@
#include "mar_private.h"
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
#include <io.h>
#include <direct.h>
#endif
@@ -25,7 +25,7 @@ static int mar_ensure_parent_dir(const char *path)
{
*slash = '\0';
mar_ensure_parent_dir(path);
-#ifdef WNT
+#ifdef _WIN32
_mkdir(path);
#else
mkdir(path, 0755);
@@ -45,7 +45,7 @@ static int mar_test_callback(MarFile *mar, const MarItem *item, void *unused) {
if (mar_ensure_parent_dir(item->name))
return -1;
-#ifdef WNT
+#ifdef _WIN32
fd = _open(item->name, _O_BINARY|_O_CREAT|_O_TRUNC|_O_WRONLY, item->flags);
#else
fd = creat(item->name, item->flags);
diff --git a/onlineupdate/source/update/src/mar_private.h b/onlineupdate/source/update/src/mar_private.h
index 39a77d1..a770998 100644
--- a/onlineupdate/source/update/src/mar_private.h
+++ b/onlineupdate/source/update/src/mar_private.h
@@ -53,7 +53,7 @@ MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \
/* The mar program is compiled as a host bin so we don't have access to NSPR at
runtime. For that reason we use ntohl, htonl, and define HOST_TO_NETWORK64
instead of the NSPR equivalents. */
-#ifdef WNT
+#ifdef _WIN32
#include <winsock2.h>
#define ftello _ftelli64
#define fseeko _fseeki64
diff --git a/onlineupdate/source/update/src/mar_read.c b/onlineupdate/source/update/src/mar_read.c
index 34f8e80..0ed8c6b 100644
--- a/onlineupdate/source/update/src/mar_read.c
+++ b/onlineupdate/source/update/src/mar_read.c
@@ -11,7 +11,7 @@
#include "mar_private.h"
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
#include <winsock2.h>
#else
#include <netinet/in.h>
@@ -177,7 +177,7 @@ MarFile *mar_open(const char *path) {
return mar_fpopen(fp);
}
-#ifdef WNT
+#ifdef _WIN32
MarFile *mar_wopen(const wchar_t *path) {
FILE *fp;
diff --git a/onlineupdate/source/update/updater/archivereader.cxx b/onlineupdate/source/update/updater/archivereader.cxx
index a7884df..23f416a 100644
--- a/onlineupdate/source/update/updater/archivereader.cxx
+++ b/onlineupdate/source/update/updater/archivereader.cxx
@@ -10,7 +10,7 @@
#include "bzlib.h"
#include "archivereader.h"
#include "errors.h"
-#ifdef WNT
+#ifdef _WIN32
#include "updatehelper.h"
#endif
@@ -202,7 +202,7 @@ ArchiveReader::Open(const NS_tchar *path)
}
}
-#ifdef WNT
+#ifdef _WIN32
mArchive = mar_wopen(path);
#else
mArchive = mar_open(path);
@@ -239,7 +239,7 @@ ArchiveReader::ExtractFile(const char *name, const NS_tchar *dest)
if (!item)
return READ_ERROR;
-#ifdef WNT
+#ifdef _WIN32
FILE* fp = _wfopen(dest, L"wb+");
#else
int fd = creat(dest, item->flags);
diff --git a/onlineupdate/source/update/updater/archivereader.h b/onlineupdate/source/update/updater/archivereader.h
index 5fa9523..8d0b7c3 100644
--- a/onlineupdate/source/update/updater/archivereader.h
+++ b/onlineupdate/source/update/updater/archivereader.h
@@ -10,7 +10,7 @@
#include <stdio.h>
#include "mar.h"
-#ifdef WNT
+#ifdef _WIN32
typedef WCHAR NS_tchar;
#else
typedef char NS_tchar;
diff --git a/onlineupdate/source/update/updater/bspatch.cxx b/onlineupdate/source/update/updater/bspatch.cxx
index 8f8e0420..09a3c43 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list