Bug 731943 - Get rid of no longer needed mingw hacks r=jimm
authorJacek Caban <jacek@codeweavers.com>
Fri, 02 Mar 2012 11:27:06 +0100
changeset 88145 85e59a087b76f98421c3fb5e3c1781c1ffd998a3
parent 88144 4069a04e8e819e095c064c270e367bb8f8850234
child 88146 1a6d1d4e8bfca1739ab5c5ab3747449705332b09
push id22173
push userbmo@edmorley.co.uk
push dateSat, 03 Mar 2012 13:14:42 +0000
treeherdermozilla-central@ed57abebd328 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs731943
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 731943 - Get rid of no longer needed mingw hacks r=jimm
widget/windows/nsDataObj.h
widget/windows/nsDataObjCollection.h
widget/windows/nsNativeDragTarget.h
--- a/widget/windows/nsDataObj.h
+++ b/widget/windows/nsDataObj.h
@@ -33,21 +33,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef _NSDATAOBJ_H_
 #define _NSDATAOBJ_H_
 
-#ifdef __MINGW32__
-#include <unknwn.h>
-#include <basetyps.h>
-#include <objidl.h>
-#endif
 #include <oleidl.h>
 #include <shldisp.h>
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsILocalFile.h"
 #include "nsIURI.h"
 #include "nsIInputStream.h"
@@ -106,45 +101,16 @@ IAsyncOperation : public IUnknown
 // then that can be made the base required version and this code should be removed.
 #ifndef CFSTR_FILEDESCRIPTORA
 # define CFSTR_FILEDESCRIPTORA   L"FileGroupDescriptor"
 #endif
 #ifndef CFSTR_FILEDESCRIPTORW
 # define CFSTR_FILEDESCRIPTORW   L"FileGroupDescriptorW"
 #endif
 
-#ifdef __MINGW32__
-# include <w32api.h>
-# if __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION == 0)
-#  ifndef FILEGROUPDESCRIPTORA
-#   define FILEGROUPDESCRIPTORA    FILEGROUPDESCRIPTOR
-#  endif
-#  ifndef LPFILEGROUPDESCRIPTORA
-#   define LPFILEGROUPDESCRIPTORA  LPFILEGROUPDESCRIPTOR
-#  endif
-typedef struct _FILEDESCRIPTORW {
-   DWORD dwFlags;
-   CLSID clsid;
-   SIZEL sizel;
-   POINTL pointl;
-   DWORD dwFileAttributes;
-   FILETIME ftCreationTime;
-   FILETIME ftLastAccessTime;
-   FILETIME ftLastWriteTime;
-   DWORD nFileSizeHigh;
-   DWORD nFileSizeLow;
-   WCHAR cFileName[MAX_PATH];
-} FILEDESCRIPTORW,*LPFILEDESCRIPTORW;
-typedef struct _FILEGROUPDESCRIPTORW {
-   UINT cItems;
-   FILEDESCRIPTORW fgd[1];
-} FILEGROUPDESCRIPTORW,*LPFILEGROUPDESCRIPTORW;
-# endif /*__W32API_MAJOR_VERSION*/
-#endif /*__MINGW32__*/
-
 class CEnumFormatEtc;
 class nsITransferable;
 
 /*
  * This ole registered class is used to facilitate drag-drop of objects which
  * can be adapted by an object derived from CfDragDrop. The CfDragDrop is
  * associated with instances via SetDragDrop().
  */
--- a/widget/windows/nsDataObjCollection.h
+++ b/widget/windows/nsDataObjCollection.h
@@ -34,21 +34,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef _NSDATAOBJCOLLECTION_H_
 #define _NSDATAOBJCOLLECTION_H_
 
-#ifdef __MINGW32__
-#include <unknwn.h>
-#include <basetyps.h>
-#include <objidl.h>
-#endif
 #include <oleidl.h>
 
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "nsDataObj.h"
 
 class CEnumFormatEtc;
--- a/widget/windows/nsNativeDragTarget.h
+++ b/widget/windows/nsNativeDragTarget.h
@@ -38,19 +38,17 @@
 #define _nsNativeDragTarget_h_
 
 #include "nsCOMPtr.h"
 #include "nsIDragSession.h"
 #include <ole2.h>
 #include <shlobj.h>
 
 #ifndef IDropTargetHelper
-#ifndef __MINGW32__   // MingW does not provide shobjidl.h.
 #include <shobjidl.h> // Vista drag image interfaces
-#endif  // MingW
 #endif
 
 class nsIDragService;
 class nsIWidget;
 
 struct IDataObject;
 
 /*