summaryrefslogtreecommitdiff
path: root/hwpfilter/source/htags.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-16 11:26:51 +0200
committerMichael Stahl <mstahl@redhat.com>2016-02-16 10:37:55 +0000
commitce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch)
treea0fbf7bbd608d1185005a0de36496c6f3656e798 /hwpfilter/source/htags.cxx
parent049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff)
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f Reviewed-on: https://gerrit.libreoffice.org/22390 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'hwpfilter/source/htags.cxx')
-rw-r--r--hwpfilter/source/htags.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/hwpfilter/source/htags.cxx b/hwpfilter/source/htags.cxx
index 3bc004a89d26..044f7d2a6a61 100644
--- a/hwpfilter/source/htags.cxx
+++ b/hwpfilter/source/htags.cxx
@@ -52,7 +52,7 @@ EmPicture::EmPicture(size_t tsize)
else
data = new uchar[size];
}
-#ifdef WIN32
+#ifdef _WIN32
#define unlink _unlink
#endif
EmPicture::~EmPicture()
@@ -83,14 +83,14 @@ OlePicture::OlePicture(int tsize)
size = tsize - 4;
if (size <= 0)
return;
-#ifndef WIN32
+#ifndef _WIN32
pis = new char[size];
#endif
};
OlePicture::~OlePicture()
{
-#ifdef WIN32
+#ifdef _WIN32
if( pis )
pis->Release();
#else
@@ -109,7 +109,7 @@ void OlePicture::Read(HWPFile & hwpf)
hwpf.Read4b(&signature, 1);
if (signature != FILESTG_SIGNATURE_NORMAL)
return;
-#ifdef WIN32
+#ifdef _WIN32
char *data = new char[size];
if (hwpf.ReadBlock(data,size) == 0)
{