Correction for issues #1956 and #1958.

diff --git a/ChangeLog b/ChangeLog
index c719db9..aea2f61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2013-05-15  Niels Kristian Bech Jensen  <nkbj@users.sourceforge.net>
+
+       * include/control.h: Correct inclusion of _mingw.h.  Issue: #1956.
+       * include/sys/stat.h: Include string.h as appropriate for memset
+       declaration.  Issue: #1956.
+       * include/wchar.h: Ditto.
+
 2013-05-15  Earnie Boyd  <earnie@users.sourceforge.net>
 
        * .gitignore: Add nbproject folder.
        * NEWS: Add note about the globbing change.
+       * include/_mingw.h: Correct check for GCC version >= 3.4.5. Issue: #1958.
 
 2013-05-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
 

diff --git a/include/_mingw.h b/include/_mingw.h
index fbb6406..821a872 100644 (file)
--- a/include/_mingw.h
+++ b/include/_mingw.h
@@ -49,7 +49,7 @@
 #error ERROR: You must use a GNU Compiler.
 #endif
 
-#if (__GNUC__ < 3 || !defined(__GNUC_MINOR__) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4 && __GNUC_PATCHLEVEL__ < 5))
+#if (__GNUC__ < 3 || !defined(__GNUC_MINOR__) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) || (__GNUC__ == 3 && __GNUC_MINOR__ == 4 && __GNUC_PATCHLEVEL__ < 5))
 #error ERROR: You must use a GNU Compiler version >= 3.4.5.
 #endif
 

diff --git a/include/control.h b/include/control.h
index dc2d8e6..9a652a0 100644 (file)
--- a/include/control.h
+++ b/include/control.h
@@ -24,7 +24,7 @@
 #ifndef _CONTROL_H
 #define _CONTROL_H
 #pragma GCC system_header
-#include <mingw.h>
+#include <_mingw.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/sys/stat.h b/include/sys/stat.h
index 9b327e3..3d7ce9a 100644 (file)
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -194,6 +194,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _fstat64 (int, struct _stat64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _fstat32i64 (int, struct _stat32i64*);
 int __cdecl __MINGW_NOTHROW _fstat64i32 (int, struct _stat64i32*);
 #ifndef __NO_INLINE__
+#include <string.h> /* Need memset declaration */
   __CRT_INLINE int __cdecl _fstat64i32(int desc, struct _stat64i32 *_stat)
   {
     struct _stat64 st;
@@ -259,6 +260,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _wstat64 (const wchar_t*, struct _stat64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wstat32i64 (const wchar_t*, struct _stat32i64*);
 int __cdecl __MINGW_NOTHROW _wstat64i32 (const wchar_t*, struct _stat64i32*);
 #ifndef __NO_INLINE__
+#include <string.h> /* Need memset declaration */
   __CRT_INLINE int __cdecl _wstat64i32(const wchar_t *fname, struct _stat64i32 *_stat)
   {
     struct _stat64 st;

diff --git a/include/wchar.h b/include/wchar.h
index 5d3dc44..e84bf05 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -544,6 +544,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _wstat64 (const wchar_t*, struct _stat64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wstat32i64 (const wchar_t*, struct _stat32i64*);
 int __cdecl __MINGW_NOTHROW _wstat64i32 (const wchar_t*, struct _stat64i32*);
 #ifndef __NO_INLINE__
+#include <string.h> /* Need memset declaration. */
   __CRT_INLINE int __cdecl _wstat64i32(const wchar_t *fname, struct _stat64i32 *_stat)
   {
     struct _stat64 st;