From 40535cb3023972e844dce4594e37bdb494102278 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Mon, 7 Apr 2008 11:37:50 +0000 Subject: [PATCH] Compile fix for cygwin and shut up gcc warning about NULL used for non-pointer type. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24145 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiClipboard.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index 803de60043..085367a506 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -43,6 +43,9 @@ #ifdef Q_WS_WIN #include +#ifdef Q_CYGWIN_WIN +#include +#endif #include #endif // Q_WS_WIN @@ -153,11 +156,11 @@ QVariant QWindowsMimeMetafile::convertToMime( if (pDataObj->GetData(&formatetc, &s) == S_OK) { if (s.tymed == TYMED_ENHMF) { - dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, NULL, NULL); + dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, 0, 0); data.resize(dataSize); dataSize = GetEnhMetaFileBits(s.hEnhMetaFile, dataSize, (LPBYTE)data.data()); } else if (s.tymed == TYMED_MFPICT) { - dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, NULL, NULL); + dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, 0, 0); data.resize(dataSize); dataSize = GetMetaFileBitsEx((HMETAFILE)s.hMetaFilePict, dataSize, (LPBYTE)data.data()); } -- 2.39.5