From 5e89ebcafdca40d8766dcd8b2768476aa3e4f15f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 20 Jul 2011 22:02:56 +0300 Subject: Fix some MinGW warnings and errors --- fpicker/source/win32/filepicker/FPentry.cxx | 4 +++- fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx | 2 +- fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 2 +- fpicker/source/win32/filepicker/platform_vista.h | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) (limited to 'fpicker/source') diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index fed7714c1b75..fcc6996429c3 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -38,9 +38,11 @@ #include "FilePicker.hxx" #include "FPServiceInfo.hxx" +#ifdef _MSC_VER #pragma warning (disable:4917) +#endif #include "VistaFilePicker.hxx" -#include "..\misc\WinImplHelper.hxx" +#include "../misc/WinImplHelper.hxx" #include //----------------------------------------------- diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 2414a6ff1229..47909d7953c9 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -75,6 +75,6 @@ class IVistaFilePickerInternalNotify #undef css -#endif FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX +#endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 14bf9fd8bfe0..f6d6b1b420fc 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -44,7 +44,7 @@ #include "FilterContainer.hxx" #include "VistaFilePickerEventHandler.hxx" #include "IVistaFilePickerInternalNotify.hxx" -#include "..\misc\resourceprovider.hxx" +#include "../misc/resourceprovider.hxx" #include diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h index a17f817163cd..03d552f118ec 100644 --- a/fpicker/source/win32/filepicker/platform_vista.h +++ b/fpicker/source/win32/filepicker/platform_vista.h @@ -48,6 +48,7 @@ #pragma warning(pop) #endif +#ifdef _MSC_VER #if defined _M_IX86 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") #elif defined _M_IA64 @@ -57,6 +58,7 @@ #else #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") #endif +#endif #endif -- cgit