Redo the filters based on assumptions discussed in mingw-dvlpr list.

	* include/sys/fcntl.h (_mingw.h): Include.
	* include/sys/file.h: Ditto.
	* include/sys/param.h: Ditto.
	* include/sys/time.h: Ditto.
	* include/sys/unistd.h: Ditto.
	* include/directx/d3d9.h: Ditto.
	* include/directx/d3d9caps.h: Ditto.
	* include/directx/d3d9types.h: Ditto.
	* include/directx/dxerr8.h: Ditto.
	* include/directx/dxerr9.h: Ditto.
	* include/gdiplus/gdiplus.h: Ditto.
	* include/gdiplus/gdiplusbase.h: Ditto.
	* include/gdiplus/gdiplusbrush.h: Ditto.
	* include/gdiplus/gdipluscolor.h: Ditto.
	* include/gdiplus/gdipluscolormatrix.h: Ditto.
	* include/gdiplus/gdipluseffects.h: Ditto.
	* include/gdiplus/gdiplusenums.h: Ditto.
	* include/gdiplus/gdiplusflat.h: Ditto.
	* include/gdiplus/gdiplusgpstubs.h: Ditto.
	* include/gdiplus/gdiplusgraphics.h: Ditto.
	* include/gdiplus/gdiplusheaders.h: Ditto.
	* include/gdiplus/gdiplusimageattributes.h: Ditto.
	* include/gdiplus/gdiplusimagecodec.h: Ditto.
	* include/gdiplus/gdiplusimaging.h: Ditto.
	* include/gdiplus/gdiplusimpl.h: Ditto.
	* include/gdiplus/gdiplusinit.h: Ditto.
	* include/gdiplus/gdipluslinecaps.h: Ditto.
	* include/gdiplus/gdiplusmatrix.h: Ditto.
	* include/gdiplus/gdiplusmem.h: Ditto.
	* include/gdiplus/gdiplusmetafile.h: Ditto.
	* include/gdiplus/gdiplusmetaheader.h: Ditto.
	* include/gdiplus/gdipluspath.h: Ditto.
	* include/gdiplus/gdipluspen.h: Ditto.
	* include/gdiplus/gdipluspixelformats.h: Ditto.
	* include/gdiplus/gdiplusstringformat.h: Ditto.
	* include/gdiplus/gdiplustypes.h: Ditto.

	* include/sys/locking.h (_mingw.h): Remove comment and move to top of
	file.
	* include/sys/stat.h: Ditto.
	* include/sys/timeb.h: Ditto.
	* include/sys/types.h: Ditto.
	* include/sys/utime.h: Ditto.

	* include/sys/locking.h (GCC system_header): Add pragma.
	* include/sys/param.h: Ditto.
	* include/sys/stat.h: Ditto.
	* include/sys/time.h: Ditto.
	* include/sys/timeb.h: Ditto.
	* include/sys/types.h: Ditto.
	* include/sys/unistd.h: Ditto.
	* include/sys/utime.h: Ditto.

	* include/directx/dxerr8.h (UNICODE): Use __AW() macro for mapping
	non-specific symbols.
	* include/directx/dxerr9.h: Ditto.

	* include/sys/timeb.h (__MSVCRT_VERSION__): Remove needless filter.
	* include/sys/types.h: Ditto.
	* include/sys/utime.h: Ditto.

	* include/sys/unistd.h (io.h): Replace with include next unistd.h.

	* TODO: Add entries.

diff --git a/ChangeLog b/ChangeLog
index 198cdf7..725be10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+2012-09-19  Earnie Boyd  <earnie@users.sourceforge.net>
+
+       Redo the filters based on assumptions discussed in mingw-dvlpr list.
+
+       * include/sys/fcntl.h (_mingw.h): Include.
+       * include/sys/file.h: Ditto.
+       * include/sys/param.h: Ditto.
+       * include/sys/time.h: Ditto.
+       * include/sys/unistd.h: Ditto.
+       * include/directx/d3d9.h: Ditto.
+       * include/directx/d3d9caps.h: Ditto.
+       * include/directx/d3d9types.h: Ditto.
+       * include/directx/dxerr8.h: Ditto.
+       * include/directx/dxerr9.h: Ditto.
+       * include/gdiplus/gdiplus.h: Ditto.
+       * include/gdiplus/gdiplusbase.h: Ditto.
+       * include/gdiplus/gdiplusbrush.h: Ditto.
+       * include/gdiplus/gdipluscolor.h: Ditto.
+       * include/gdiplus/gdipluscolormatrix.h: Ditto.
+       * include/gdiplus/gdipluseffects.h: Ditto.
+       * include/gdiplus/gdiplusenums.h: Ditto.
+       * include/gdiplus/gdiplusflat.h: Ditto.
+       * include/gdiplus/gdiplusgpstubs.h: Ditto.
+       * include/gdiplus/gdiplusgraphics.h: Ditto.
+       * include/gdiplus/gdiplusheaders.h: Ditto.
+       * include/gdiplus/gdiplusimageattributes.h: Ditto.
+       * include/gdiplus/gdiplusimagecodec.h: Ditto.
+       * include/gdiplus/gdiplusimaging.h: Ditto.
+       * include/gdiplus/gdiplusimpl.h: Ditto.
+       * include/gdiplus/gdiplusinit.h: Ditto.
+       * include/gdiplus/gdipluslinecaps.h: Ditto.
+       * include/gdiplus/gdiplusmatrix.h: Ditto.
+       * include/gdiplus/gdiplusmem.h: Ditto.
+       * include/gdiplus/gdiplusmetafile.h: Ditto.
+       * include/gdiplus/gdiplusmetaheader.h: Ditto.
+       * include/gdiplus/gdipluspath.h: Ditto.
+       * include/gdiplus/gdipluspen.h: Ditto.
+       * include/gdiplus/gdipluspixelformats.h: Ditto.
+       * include/gdiplus/gdiplusstringformat.h: Ditto.
+       * include/gdiplus/gdiplustypes.h: Ditto.
+
+       * include/sys/locking.h (_mingw.h): Remove comment and move to top of
+       file.
+       * include/sys/stat.h: Ditto.
+       * include/sys/timeb.h: Ditto.
+       * include/sys/types.h: Ditto.
+       * include/sys/utime.h: Ditto.
+
+       * include/sys/locking.h (GCC system_header): Add pragma.
+       * include/sys/param.h: Ditto.
+       * include/sys/stat.h: Ditto.
+       * include/sys/time.h: Ditto.
+       * include/sys/timeb.h: Ditto.
+       * include/sys/types.h: Ditto.
+       * include/sys/unistd.h: Ditto.
+       * include/sys/utime.h: Ditto.
+
+       * include/directx/dxerr8.h (UNICODE): Use __AW() macro for mapping
+       non-specific symbols.
+       * include/directx/dxerr9.h: Ditto.
+
+       * include/sys/timeb.h (__MSVCRT_VERSION__): Remove needless filter.
+       * include/sys/types.h: Ditto.
+       * include/sys/utime.h: Ditto.
+
+       * include/sys/unistd.h (io.h): Replace with include next unistd.h.
+
+       * TODO: Add entries.
+
 2012-09-18  Earnie Boyd  <earnie@users.sourceforge.net>
 
        Redo the filters based on assumptions discussed in mingw-dvlpr list.

diff --git a/TODO b/TODO
index 724b0b6..8c5e7f7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -63,3 +63,10 @@
 ** winuser.h: __W32API_USE_DLLIMPORT__
 ** ws2tcpip.h: GetNameInfoW - Add declaration.
 ** wspiapi.h: Add file.
+** sys/timeb.h - _USE_32BIT_TIME_T
+** sys/types.h - _USE_32BIT_TIME_T
+** sys/utime.h - _USE_32BIT_TIME_T
+** gdiplus/gdiplusenums.h: FIXME
+** gdiplus/gdiplusimpl.h: FIXME
+** gdiplus/gdiplusmetaheader.h: FIXME
+** gdiplus/gdiplustypes.h: FIXME

diff --git a/include/directx/d3d9.h b/include/directx/d3d9.h
index 0cc5b92..1d977f5 100644 (file)
--- a/include/directx/d3d9.h
+++ b/include/directx/d3d9.h
@@ -24,6 +24,7 @@
 #ifndef _D3D9_H
 #define _D3D9_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifndef DIRECT3D_VERSION
 #define DIRECT3D_VERSION  0x0900
@@ -86,6 +87,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 extern const GUID IID_IDirect3D9;
 extern const GUID IID_IDirect3DDevice9;
 extern const GUID IID_IDirect3DVolume9;
@@ -103,6 +105,7 @@ extern const GUID IID_IDirect3DVertexShader9;
 extern const GUID IID_IDirect3DPixelShader9;
 extern const GUID IID_IDirect3DStateBlock9;
 extern const GUID IID_IDirect3DQuery9;
+
 #ifdef __cplusplus
 };
 #endif
@@ -1293,5 +1296,6 @@ extern "C" IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);
 extern IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);
 #endif
 
-#endif
+#endif /* (DIRECT3D_VERSION >= 0x0900) */
+
 #endif

diff --git a/include/directx/d3d9caps.h b/include/directx/d3d9caps.h
index c3fd9b8..fed4db8 100644 (file)
--- a/include/directx/d3d9caps.h
+++ b/include/directx/d3d9caps.h
@@ -24,6 +24,7 @@
 #ifndef _D3D9_CAPS_H
 #define _D3D9_CAPS_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifndef DIRECT3D_VERSION
 #define DIRECT3D_VERSION  0x0900
@@ -343,5 +344,6 @@ typedef struct _D3DCAPS9 {
        DWORD MaxPixelShader30InstructionSlots;
 } D3DCAPS9;
 
-#endif
+#endif /* (DIRECT3D_VERSION >= 0x0900) */
+
 #endif

diff --git a/include/directx/d3d9types.h b/include/directx/d3d9types.h
index f080e7c..3204247 100644 (file)
--- a/include/directx/d3d9types.h
+++ b/include/directx/d3d9types.h
@@ -24,6 +24,7 @@
 #ifndef _D3D9_TYPES_H
 #define _D3D9_TYPES_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifndef DIRECT3D_VERSION
 #define DIRECT3D_VERSION  0x0900
@@ -1277,5 +1278,6 @@ typedef struct _D3DVOLUME_DESC {
 
 #include <poppack.h>
 
-#endif
+#endif /* (DIRECT3D_VERSION >= 0x0900) */
+
 #endif

diff --git a/include/directx/dxerr8.h b/include/directx/dxerr8.h
index 294823f..b3df618 100644 (file)
--- a/include/directx/dxerr8.h
+++ b/include/directx/dxerr8.h
@@ -24,6 +24,7 @@
 #ifndef _DXERR8_H
 #define _DXERR8_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,15 +37,9 @@ const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT);
 HRESULT WINAPI DXTraceA(const char*,DWORD,HRESULT,const char*,BOOL);
 HRESULT WINAPI DXTraceW(const char*,DWORD,HRESULT,const WCHAR*,BOOL);
 
-#ifdef UNICODE
-#define DXGetErrorString8 DXGetErrorString8W
-#define DXGetErrorDescription8 DXGetErrorDescription8W
-#define DXTrace DXTraceW
-#else
-#define DXGetErrorString8 DXGetErrorString8A
-#define DXGetErrorDescription8 DXGetErrorDescription8A
-#define DXTrace DXTraceA
-#endif 
+#define DXGetErrorString8 __AW(DXGetErrorString8)
+#define DXGetErrorDescription8 __AW(DXGetErrorDescription8)
+#define DXTrace __AW(DXTrace)
 
 #if defined(DEBUG) || defined(_DEBUG)
 #define DXTRACE_MSG(str)       DXTrace(__FILE__,(DWORD)__LINE__,0,str,FALSE)
@@ -59,4 +54,5 @@ HRESULT WINAPI DXTraceW(const char*,DWORD,HRESULT,const WCHAR*,BOOL);
 #ifdef __cplusplus
 }
 #endif
+
 #endif

diff --git a/include/directx/dxerr9.h b/include/directx/dxerr9.h
index 0d17c69..078784f 100644 (file)
--- a/include/directx/dxerr9.h
+++ b/include/directx/dxerr9.h
@@ -24,6 +24,7 @@
 #ifndef _DXERR9_H
 #define _DXERR9_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,15 +37,9 @@ const WCHAR* WINAPI DXGetErrorDescription9W(HRESULT);
 HRESULT WINAPI DXTraceA(const char*,DWORD,HRESULT,const char*,BOOL);
 HRESULT WINAPI DXTraceW(const char*,DWORD,HRESULT,const WCHAR*,BOOL);
 
-#ifdef UNICODE
-#define DXGetErrorString9 DXGetErrorString9W
-#define DXGetErrorDescription9 DXGetErrorDescription9W
-#define DXTrace DXTraceW
-#else
-#define DXGetErrorString9 DXGetErrorString9A
-#define DXGetErrorDescription9 DXGetErrorDescription9A
-#define DXTrace DXTraceA
-#endif 
+#define DXGetErrorString9 __AW(DXGetErrorString9)
+#define DXGetErrorDescription9 __AW(DXGetErrorDescription9)
+#define DXTrace __AW(DXTrace)
 
 #if defined(DEBUG) || defined(_DEBUG)
 #define DXTRACE_MSG(str)       DXTrace(__FILE__,(DWORD)__LINE__,0,str,FALSE)
@@ -59,4 +54,5 @@ HRESULT WINAPI DXTraceW(const char*,DWORD,HRESULT,const WCHAR*,BOOL);
 #ifdef __cplusplus
 }
 #endif
+
 #endif

diff --git a/include/gdiplus/gdiplus.h b/include/gdiplus/gdiplus.h
index dcacf16..9a27fb6 100644 (file)
--- a/include/gdiplus/gdiplus.h
+++ b/include/gdiplus/gdiplus.h
@@ -24,6 +24,7 @@
 #ifndef __GDIPLUS_H
 #define __GDIPLUS_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifndef RC_INVOKED
 

diff --git a/include/gdiplus/gdiplusbase.h b/include/gdiplus/gdiplusbase.h
index 0e82666..6b0342a 100644 (file)
--- a/include/gdiplus/gdiplusbase.h
+++ b/include/gdiplus/gdiplusbase.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_BASE_H
+#define __GDIPLUS_BASE_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ base class
  */
 
-#ifndef __GDIPLUS_BASE_H
-#define __GDIPLUS_BASE_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusbase.h."
 #endif

diff --git a/include/gdiplus/gdiplusbrush.h b/include/gdiplus/gdiplusbrush.h
index 0390adf..bc75ab4 100644 (file)
--- a/include/gdiplus/gdiplusbrush.h
+++ b/include/gdiplus/gdiplusbrush.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_BRUSH_H
+#define __GDIPLUS_BRUSH_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ brush classes
  */
 
-#ifndef __GDIPLUS_BRUSH_H
-#define __GDIPLUS_BRUSH_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusbrush.h."
 #endif

diff --git a/include/gdiplus/gdipluscolor.h b/include/gdiplus/gdipluscolor.h
index ac42d20..3cd6a69 100644 (file)
--- a/include/gdiplus/gdipluscolor.h
+++ b/include/gdiplus/gdipluscolor.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_COLOR_H
+#define __GDIPLUS_COLOR_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ color
  */
 
-#ifndef __GDIPLUS_COLOR_H
-#define __GDIPLUS_COLOR_H
-#pragma GCC system_header
-
 typedef enum ColorChannelFlags {
        ColorChannelFlagsC = 0,
        ColorChannelFlagsM = 1,

diff --git a/include/gdiplus/gdipluscolormatrix.h b/include/gdiplus/gdipluscolormatrix.h
index e450d9f..07bb48e 100644 (file)
--- a/include/gdiplus/gdipluscolormatrix.h
+++ b/include/gdiplus/gdipluscolormatrix.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_COLORMATRIX_H
+#define __GDIPLUS_COLORMATRIX_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ color mappings
  */
 
-#ifndef __GDIPLUS_COLORMATRIX_H
-#define __GDIPLUS_COLORMATRIX_H
-#pragma GCC system_header
-
 typedef enum ColorAdjustType {
        ColorAdjustTypeDefault = 0,
        ColorAdjustTypeBitmap = 1,

diff --git a/include/gdiplus/gdipluseffects.h b/include/gdiplus/gdipluseffects.h
index 277e37c..6bba286 100644 (file)
--- a/include/gdiplus/gdipluseffects.h
+++ b/include/gdiplus/gdipluseffects.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_EFFECTS_H
+#define __GDIPLUS_EFFECTS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ filters and effects
  */
 
-#ifndef __GDIPLUS_EFFECTS_H
-#define __GDIPLUS_EFFECTS_H
-#pragma GCC system_header
-
 typedef enum CurveAdjustments {
        AdjustExposure = 0,
        AdjustDensity = 1,

diff --git a/include/gdiplus/gdiplusenums.h b/include/gdiplus/gdiplusenums.h
index c413cf5..804d75b 100644 (file)
--- a/include/gdiplus/gdiplusenums.h
+++ b/include/gdiplus/gdiplusenums.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_ENUMS_H
+#define __GDIPLUS_ENUMS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ enumerations
  */
 
-#ifndef __GDIPLUS_ENUMS_H
-#define __GDIPLUS_ENUMS_H
-#pragma GCC system_header
-
 typedef enum BrushType {
        BrushTypeSolidColor = 0,
        BrushTypeHatchFill = 1,

diff --git a/include/gdiplus/gdiplusflat.h b/include/gdiplus/gdiplusflat.h
index e8118bc..736f5d4 100644 (file)
--- a/include/gdiplus/gdiplusflat.h
+++ b/include/gdiplus/gdiplusflat.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_FLAT_H
+#define __GDIPLUS_FLAT_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Flat API
  */
 
-#ifndef __GDIPLUS_FLAT_H
-#define __GDIPLUS_FLAT_H
-#pragma GCC system_header
-
 #ifdef __cplusplus
 namespace DllExports {
 extern "C" {
@@ -253,14 +253,17 @@ GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,
 GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*,GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
 GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics*,GpImage*,GDIPCONST GpPoint*,INT,INT,INT,INT,INT,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
 GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics*,GpImage*,GpRectF*,GpMatrix*,CGpEffect*,GpImageAttributes*,GpUnit);
+
 #ifdef __cplusplus
 GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoint(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST PointF&,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST Point&,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST RectF&,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST Rect&,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 #endif
+
 GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoints(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST PointF*,INT,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointsI(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST Point*,INT,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
+
 #ifdef __cplusplus
 GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoint(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST PointF&,GDIPCONST RectF&,Unit,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPointI(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST Point&,GDIPCONST Rect&,Unit,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
@@ -269,6 +272,7 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRectI(GpGraphics*,GDIPCONST
 GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST PointF*,INT,GDIPCONST RectF&,Unit,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPointsI(GpGraphics*,GDIPCONST GpMetafile*,GDIPCONST Point*,INT,GDIPCONST Rect&,Unit,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
 #endif
+
 GpStatus WINGDIPAPI GdipSetClipGraphics(GpGraphics*,GpGraphics*,CombineMode);
 GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode);
 GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode);
@@ -692,9 +696,11 @@ GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(GpStringFormat*
 /* Text functions */
 GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT,GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,GDIPCONST GpBrush*);
 GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT,GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*);
+
 #ifdef __cplusplus
 GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*,GDIPCONST WCHAR*,INT,GDIPCONST GpFont*,GDIPCONST RectF&,GDIPCONST GpStringFormat*,INT,GpRegion**);
 #endif
+
 GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics*,GDIPCONST UINT16*,INT,GDIPCONST GpFont*,GDIPCONST GpBrush*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*);
 GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics*,GDIPCONST UINT16*,INT,GDIPCONST GpFont*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*,RectF*);
 

diff --git a/include/gdiplus/gdiplusgpstubs.h b/include/gdiplus/gdiplusgpstubs.h
index 1c75455..a2ac08b 100644 (file)
--- a/include/gdiplus/gdiplusgpstubs.h
+++ b/include/gdiplus/gdiplusgpstubs.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_GPSTUBS_H
+#define __GDIPLUS_GPSTUBS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Gp* type declarations
  */
 
-#ifndef __GDIPLUS_GPSTUBS_H
-#define __GDIPLUS_GPSTUBS_H
-#pragma GCC system_header
-
 typedef Point GpPoint;
 typedef PointF GpPointF;
 typedef Rect GpRect;

diff --git a/include/gdiplus/gdiplusgraphics.h b/include/gdiplus/gdiplusgraphics.h
index 5d82f14..d8425e0 100644 (file)
--- a/include/gdiplus/gdiplusgraphics.h
+++ b/include/gdiplus/gdiplusgraphics.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_GRAPHICS_H
+#define __GDIPLUS_GRAPHICS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Graphics class
  */
 
-#ifndef __GDIPLUS_GRAPHICS_H
-#define __GDIPLUS_GRAPHICS_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusgraphics.h."
 #endif

diff --git a/include/gdiplus/gdiplusheaders.h b/include/gdiplus/gdiplusheaders.h
index fc1b611..9af86fd 100644 (file)
--- a/include/gdiplus/gdiplusheaders.h
+++ b/include/gdiplus/gdiplusheaders.h
@@ -21,6 +21,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_HEADERS_H
+#define __GDIPLUS_HEADERS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Bitmap, CachedBitmap, CustomLineCap, Font, FontCollection,
@@ -29,10 +33,6 @@
  *      Implementation of these classes is in gdiplusimpl.h.
  */
 
-#ifndef __GDIPLUS_HEADERS_H
-#define __GDIPLUS_HEADERS_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusheaders.h."
 #endif

diff --git a/include/gdiplus/gdiplusimageattributes.h b/include/gdiplus/gdiplusimageattributes.h
index 87e2357..f352b41 100644 (file)
--- a/include/gdiplus/gdiplusimageattributes.h
+++ b/include/gdiplus/gdiplusimageattributes.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_IMAGEATTRIBUTES_H
+#define __GDIPLUS_IMAGEATTRIBUTES_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ ImageAttributes class
  */
 
-#ifndef __GDIPLUS_IMAGEATTRIBUTES_H
-#define __GDIPLUS_IMAGEATTRIBUTES_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusimageattributes.h."
 #endif

diff --git a/include/gdiplus/gdiplusimagecodec.h b/include/gdiplus/gdiplusimagecodec.h
index 419826e..1db86f5 100644 (file)
--- a/include/gdiplus/gdiplusimagecodec.h
+++ b/include/gdiplus/gdiplusimagecodec.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_IMAGECODEC_H
+#define __GDIPLUS_IMAGECODEC_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ image decoders and encoders
  */
 
-#ifndef __GDIPLUS_IMAGECODEC_H
-#define __GDIPLUS_IMAGECODEC_H
-#pragma GCC system_header
-
 static __inline__ GpStatus GetImageDecoders(UINT numDecoders, UINT size,
                ImageCodecInfo *decoders)
 {

diff --git a/include/gdiplus/gdiplusimaging.h b/include/gdiplus/gdiplusimaging.h
index 4607ce2..50629b8 100644 (file)
--- a/include/gdiplus/gdiplusimaging.h
+++ b/include/gdiplus/gdiplusimaging.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_IMAGING_H
+#define __GDIPLUS_IMAGING_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Imaging and image metadata
  */
 
-#ifndef __GDIPLUS_IMAGING_H
-#define __GDIPLUS_IMAGING_H
-#pragma GCC system_header
-
 typedef enum ImageCodecFlags {
        ImageCodecFlagsEncoder = 0x00000001,
        ImageCodecFlagsDecoder = 0x00000002,

diff --git a/include/gdiplus/gdiplusimpl.h b/include/gdiplus/gdiplusimpl.h
index 86db39c..e7bfb8d 100644 (file)
--- a/include/gdiplus/gdiplusimpl.h
+++ b/include/gdiplus/gdiplusimpl.h
@@ -21,6 +21,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_IMPL_H
+#define __GDIPLUS_IMPL_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Bitmap, CachedBitmap, CustomLineCap, Font, FontCollection, FontFamily,
@@ -28,10 +32,6 @@
  *      implementation.  Definitions of these classes are in gdiplusheaders.h.
  */
 
-#ifndef __GDIPLUS_IMPL_H
-#define __GDIPLUS_IMPL_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusimpl.h."
 #endif

diff --git a/include/gdiplus/gdiplusinit.h b/include/gdiplus/gdiplusinit.h
index 3274795..eff582c 100644 (file)
--- a/include/gdiplus/gdiplusinit.h
+++ b/include/gdiplus/gdiplusinit.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_INIT_H
+#define __GDIPLUS_INIT_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Initialization
  */
 
-#ifndef __GDIPLUS_INIT_H
-#define __GDIPLUS_INIT_H
-#pragma GCC system_header
-
 typedef struct GdiplusStartupInput {
        UINT32 GdiplusVersion;
        DebugEventProc DebugEventCallback;

diff --git a/include/gdiplus/gdipluslinecaps.h b/include/gdiplus/gdipluslinecaps.h
index 40ec277..f0acc5d 100644 (file)
--- a/include/gdiplus/gdipluslinecaps.h
+++ b/include/gdiplus/gdipluslinecaps.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_LINECAPS_H
+#define __GDIPLUS_LINECAPS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ AdjustableArrowCap class
  */
 
-#ifndef __GDIPLUS_LINECAPS_H
-#define __GDIPLUS_LINECAPS_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdipluslinecaps.h."
 #endif

diff --git a/include/gdiplus/gdiplusmatrix.h b/include/gdiplus/gdiplusmatrix.h
index 55d8c0f..98cdb13 100644 (file)
--- a/include/gdiplus/gdiplusmatrix.h
+++ b/include/gdiplus/gdiplusmatrix.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_MATRIX_H
+#define __GDIPLUS_MATRIX_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Matrix class
  */
 
-#ifndef __GDIPLUS_MATRIX_H
-#define __GDIPLUS_MATRIX_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusmatrix.h."
 #endif

diff --git a/include/gdiplus/gdiplusmem.h b/include/gdiplus/gdiplusmem.h
index 51566c2..bca15ef 100644 (file)
--- a/include/gdiplus/gdiplusmem.h
+++ b/include/gdiplus/gdiplusmem.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_MEM_H
+#define __GDIPLUS_MEM_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ memory allocation
  */
 
-#ifndef __GDIPLUS_MEM_H
-#define __GDIPLUS_MEM_H
-#pragma GCC system_header
-
 #ifdef __cplusplus
 namespace DllExports {
 extern "C" {

diff --git a/include/gdiplus/gdiplusmetafile.h b/include/gdiplus/gdiplusmetafile.h
index 5754723..f4a056f 100644 (file)
--- a/include/gdiplus/gdiplusmetafile.h
+++ b/include/gdiplus/gdiplusmetafile.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_METAFILE_H
+#define __GDIPLUS_METAFILE_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Metafile class
  */
 
-#ifndef __GDIPLUS_METAFILE_H
-#define __GDIPLUS_METAFILE_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusmetafile.h."
 #endif

diff --git a/include/gdiplus/gdiplusmetaheader.h b/include/gdiplus/gdiplusmetaheader.h
index b98aca6..c4fefcf 100644 (file)
--- a/include/gdiplus/gdiplusmetaheader.h
+++ b/include/gdiplus/gdiplusmetaheader.h
@@ -21,15 +21,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-/*
- * GDI+ metafile header structure
- */
-
 #ifndef __GDIPLUS_METAHEADER_H
 #define __GDIPLUS_METAHEADER_H
 #pragma GCC system_header
+#include <_mingw.h>
 
+/*
+ * GDI+ metafile header structure
+ */
 
 /*
  * FIXME: is 1 the correct value for GDIP_EMFPLUSFLAGS_DISPLAY? This number

diff --git a/include/gdiplus/gdipluspath.h b/include/gdiplus/gdipluspath.h
index 14faec8..6e40ecf 100644 (file)
--- a/include/gdiplus/gdipluspath.h
+++ b/include/gdiplus/gdipluspath.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_PATH_H
+#define __GDIPLUS_PATH_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ GraphicsPath class
  */
 
-#ifndef __GDIPLUS_PATH_H
-#define __GDIPLUS_PATH_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdipluspath.h."
 #endif

diff --git a/include/gdiplus/gdipluspen.h b/include/gdiplus/gdipluspen.h
index ac58cbc..80fde27 100644 (file)
--- a/include/gdiplus/gdipluspen.h
+++ b/include/gdiplus/gdipluspen.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_PEN_H
+#define __GDIPLUS_PEN_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ Pen class
  */
 
-#ifndef __GDIPLUS_PEN_H
-#define __GDIPLUS_PEN_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdipluspen.h."
 #endif

diff --git a/include/gdiplus/gdipluspixelformats.h b/include/gdiplus/gdipluspixelformats.h
index c0219b4..bf0f074 100644 (file)
--- a/include/gdiplus/gdipluspixelformats.h
+++ b/include/gdiplus/gdipluspixelformats.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_PIXELFORMATS_H
+#define __GDIPLUS_PIXELFORMATS_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ pixel formats
  */
 
-#ifndef __GDIPLUS_PIXELFORMATS_H
-#define __GDIPLUS_PIXELFORMATS_H
-#pragma GCC system_header
-
 typedef DWORD ARGB;
 typedef INT PixelFormat;
 

diff --git a/include/gdiplus/gdiplusstringformat.h b/include/gdiplus/gdiplusstringformat.h
index 229f372..6cab51b 100644 (file)
--- a/include/gdiplus/gdiplusstringformat.h
+++ b/include/gdiplus/gdiplusstringformat.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_STRINGFORMAT_H
+#define __GDIPLUS_STRINGFORMAT_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ StringFormat class
  */
 
-#ifndef __GDIPLUS_STRINGFORMAT_H
-#define __GDIPLUS_STRINGFORMAT_H
-#pragma GCC system_header
-
 #ifndef __cplusplus
 #error "A C++ compiler is required to include gdiplusstringformat.h."
 #endif

diff --git a/include/gdiplus/gdiplustypes.h b/include/gdiplus/gdiplustypes.h
index 9453263..217db64 100644 (file)
--- a/include/gdiplus/gdiplustypes.h
+++ b/include/gdiplus/gdiplustypes.h
@@ -21,15 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __GDIPLUS_TYPES_H
+#define __GDIPLUS_TYPES_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * GDI+ basic type declarations
  */
 
-#ifndef __GDIPLUS_TYPES_H
-#define __GDIPLUS_TYPES_H
-#pragma GCC system_header
-
 #define WINGDIPAPI __stdcall
 #define GDIPCONST const
 

diff --git a/include/sys/fcntl.h b/include/sys/fcntl.h
index ab8ca5a..1ba56b8 100644 (file)
--- a/include/sys/fcntl.h
+++ b/include/sys/fcntl.h
@@ -21,5 +21,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <_mingw.h>
 
 #include <fcntl.h>

diff --git a/include/sys/file.h b/include/sys/file.h
index 88a33cd..4a28bcc 100644 (file)
--- a/include/sys/file.h
+++ b/include/sys/file.h
@@ -21,4 +21,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <_mingw.h>
 #include <fcntl.h>

diff --git a/include/sys/locking.h b/include/sys/locking.h
index 282220f..563d62e 100644 (file)
--- a/include/sys/locking.h
+++ b/include/sys/locking.h
@@ -23,8 +23,7 @@
  */
 #ifndef        _LOCKING_H_
 #define        _LOCKING_H_
-
-/* All the headers include this file. */
+#pragma GCC system_header
 #include <_mingw.h>
 
 #define        _LK_UNLCK       0       /* Unlock */

diff --git a/include/sys/param.h b/include/sys/param.h
index 40db10e..1b0f7cd 100644 (file)
--- a/include/sys/param.h
+++ b/include/sys/param.h
@@ -23,6 +23,8 @@
  */
 #ifndef _SYS_PARAM_H
 #define _SYS_PARAM_H
+#pragma GCC system_header
+#include <_mingw.h>
 
 #include <sys/types.h>
 #include <limits.h>

diff --git a/include/sys/stat.h b/include/sys/stat.h
index b39a792..0be14c3 100644 (file)
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -23,8 +23,7 @@
  */
 #ifndef _STAT_H_
 #define _STAT_H_
-
-/* All the headers include this file. */
+#pragma GCC system_header
 #include <_mingw.h>
 
 #define __need_size_t

diff --git a/include/sys/time.h b/include/sys/time.h
index 65b7eff..5a9651b 100644 (file)
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -23,6 +23,9 @@
  */
 #ifndef _SYS_TIME_H_
 #define _SYS_TIME_H_
+#pragma GCC system_header
+#include <_mingw.h>
+
 #include <time.h>
 
 #ifdef __cplusplus
@@ -66,5 +69,4 @@ int __cdecl __MINGW_NOTHROW gettimeofday(struct timeval *__restrict__,
 }
 #endif
 
-
 #endif /* _SYS_TIME_H_ */

diff --git a/include/sys/timeb.h b/include/sys/timeb.h
index dccacd9..a06f90d 100644 (file)
--- a/include/sys/timeb.h
+++ b/include/sys/timeb.h
@@ -23,13 +23,13 @@
  */
 #ifndef        _TIMEB_H_
 #define        _TIMEB_H_
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * Support for the UNIX System V ftime system call.
  */
 
-/* All the headers include this file. */
-#include <_mingw.h>
 #include <sys/types.h>
 
 #ifndef        RC_INVOKED
@@ -45,7 +45,6 @@ struct _timeb
        short   dstflag;
 };
 
-#if __MSVCRT_VERSION__ >= 0x0800
 /*
  * TODO: Structure not tested.
  */
@@ -56,7 +55,6 @@ struct __timeb32
        short   timezone;
        short   dstflag;
 };
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 #ifndef        _NO_OLDNAMES
 /*
@@ -84,7 +82,6 @@ _CRTIMP void __cdecl __MINGW_NOTHROW  ftime (struct timeb*);
 #endif /* Not _NO_OLDNAMES */
 
 /* This requires newer versions of msvcrt.dll (6.10 or higher).  */ 
-#if __MSVCRT_VERSION__ >= 0x0601
 struct __timeb64
 {
   __time64_t time;
@@ -94,16 +91,15 @@ struct __timeb64
 };
 
 _CRTIMP void __cdecl __MINGW_NOTHROW   _ftime64 (struct __timeb64*);
-#endif /* __MSVCRT_VERSION__ >= 0x0601 */
 
-#if __MSVCRT_VERSION__ >= 0x0800
 _CRTIMP void __cdecl __MINGW_NOTHROW   _ftime32 (struct __timeb32*);
+
 #ifndef _USE_32BIT_TIME_T
 _CRTALIAS void __cdecl __MINGW_NOTHROW _ftime (struct _timeb* _v) { return(_ftime64 ((struct __timeb64*)_v)); }
 #else
+
 _CRTALIAS void __cdecl __MINGW_NOTHROW _ftime (struct _timeb* _v) { return(_ftime32 ((struct __timeb32*)_v)); }
 #endif
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 #ifdef __cplusplus
 }

diff --git a/include/sys/types.h b/include/sys/types.h
index bb34549..e970fa5 100644 (file)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -23,8 +23,7 @@
  */
 #ifndef        _TYPES_H_
 #define        _TYPES_H_
-
-/* All the headers include this file. */
+#pragma GCC system_header
 #include <_mingw.h>
 
 #define __need_wchar_t
@@ -48,15 +47,16 @@ typedef __int64 __time64_t;
 
 #ifndef _TIME_T_DEFINED
 /* FIXME __STRICT_ANSI__ ! */
-#if __MSVCRT_VERSION__ >= 0x0800
+
 #ifndef _USE_32BIT_TIME_T
 typedef        __time64_t time_t;
 #else
+
 typedef        __time32_t time_t;
 #endif /* !_USE_32BIT_TIME_T */
+
 #else
 typedef        __time32_t time_t;
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 #define _TIME_T_DEFINED
 #endif
 

diff --git a/include/sys/unistd.h b/include/sys/unistd.h
index aa176d9..0b88203 100644 (file)
--- a/include/sys/unistd.h
+++ b/include/sys/unistd.h
@@ -21,8 +21,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#pragma GCC system_header
+#include <_mingw.h>
 
 /*
  * unistd.h maps (roughly) to io.h
  */
-#include <io.h>
+#include_next <unistd.h>

diff --git a/include/sys/utime.h b/include/sys/utime.h
index 760ea5f..169f6d0 100644 (file)
--- a/include/sys/utime.h
+++ b/include/sys/utime.h
@@ -23,19 +23,16 @@
  */
 #ifndef        _UTIME_H_
 #define        _UTIME_H_
-
-/* All the headers include this file. */
+#pragma GCC system_header
 #include <_mingw.h>
 
 #define __need_wchar_t
 #define __need_size_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif /* Not RC_INVOKED */
-#include <sys/types.h>
 
-#ifndef        RC_INVOKED
+#include <sys/types.h>
 
+#ifndef RC_INVOKED
+#include <stddef.h>
 /*
  * Structure used by _utime function.
  */
@@ -44,13 +41,11 @@ struct _utimbuf
        time_t  actime;         /* Access time */
        time_t  modtime;        /* Modification time */
 };
-#if __MSVCRT_VERSION__ >= 0x0800
 struct __utimbuf32
 {
        __time32_t actime;
        __time32_t modtime;
 };
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 
 #ifndef        _NO_OLDNAMES
@@ -66,27 +61,20 @@ struct utimbuf
 extern "C" {
 #endif
 
-#if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW    _utime (const char*, struct _utimbuf*);
-#endif
 
 #ifndef        _NO_OLDNAMES
 /* FIXME for __MSVCRT_VERSION__ >= 0x0800 */
 _CRTIMP int __cdecl __MINGW_NOTHROW    utime (const char*, struct utimbuf*);
 #endif /* Not _NO_OLDNAMES */
 
-#if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW    _futime (int, struct _utimbuf*);
-#endif
 
 /* The wide character version, only available for MSVCRT versions of the
  * C runtime library. */
-#if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW    _wutime (const wchar_t*, struct _utimbuf*);
-#endif
 
 /* These require newer versions of msvcrt.dll (6.10 or higher).  */ 
-#if __MSVCRT_VERSION__ >= 0x0601
 struct __utimbuf64
 {
        __time64_t actime;
@@ -96,22 +84,21 @@ struct __utimbuf64
 _CRTIMP int __cdecl __MINGW_NOTHROW    _utime64 (const char*, struct __utimbuf64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW    _wutime64 (const wchar_t*, struct __utimbuf64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW    _futime64 (int, struct __utimbuf64*);
-#endif /* __MSVCRT_VERSION__ >= 0x0601 */
 
-#if __MSVCRT_VERSION__ >= 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW    _utime32 (const char*, struct __utimbuf32*);
 _CRTIMP int __cdecl __MINGW_NOTHROW    _wutime32 (const wchar_t*, struct __utimbuf32*);
 _CRTIMP int __cdecl __MINGW_NOTHROW    _futime32 (int, struct __utimbuf32*);
+
 #ifndef _USE_32BIT_TIME_T
 _CRTALIAS int __cdecl __MINGW_NOTHROW  _utime (const char* _v1, struct _utimbuf* _v2)     { return(_utime64  (_v1,(struct __utimbuf64*)_v2)); }
 _CRTALIAS int __cdecl __MINGW_NOTHROW  _wutime (const wchar_t* _v1, struct _utimbuf* _v2) { return(_wutime64 (_v1,(struct __utimbuf64*)_v2)); }
 _CRTALIAS int __cdecl __MINGW_NOTHROW  _futime (int _v1, struct _utimbuf* _v2)            { return(_futime64 (_v1,(struct __utimbuf64*)_v2)); }
 #else
+
 _CRTALIAS int __cdecl __MINGW_NOTHROW  _utime (const char* _v1, struct _utimbuf* _v2)     { return(_utime32  (_v1,(struct __utimbuf32*)_v2)); }
 _CRTALIAS int __cdecl __MINGW_NOTHROW  _wutime (const wchar_t* _v1, struct _utimbuf* _v2) { return(_wutime32 (_v1,(struct __utimbuf32*)_v2)); }
 _CRTALIAS int __cdecl __MINGW_NOTHROW  _futime (int _v1, struct _utimbuf* _v2)            { return(_futime32 (_v1,(struct __utimbuf32*)_v2)); }
 #endif
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 #ifdef __cplusplus
 }