Commit: 61dae35a3a310d8682e928473ffa9f74bf392162 - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

Commit MetaInfo

• Revision: 61dae35a3a310d8682e928473ffa9f74bf392162 (tree)
• Time: 2013-09-20 00:32:57
• Author: Earnie Boyd <earnie@user...>
• Commiter: Earnie Boyd

Log Message

Resolve issues [#2021], [#2046] and [#2020].

Change Summary

• modified: ChangeLog
• modified: include/_mingw.h
• modified: include/stdio.h
• modified: include/stdlib.h
• modified: include/unistd.h

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 RELEASE 4.1:
 
[phone]  Earnie Boyd  <[e-mail]>
+
+	* include/stdio.h (_fseeki64): Remove import and create alias [#2021].
+	(_ftelli64): Ditto.
+	(_fseeki64_nolock): Ditto.
+	(_ftelli64_nolock): Ditto.
+	(_fseek_nolock): Ditto.
+	(_ftell_nolock): Ditto.
+	* include/unistd.h: Guard entire file not just the functions w.r.t.
+	__STRICT_ANSI__ [#2046].
+	* include/_mingw.h (__MINGW_MSVCR_PREREQ()): New macro to determine
+	if we are using a versioned MSVCR## library.
+	* include/stdlib.h (_set_invalid_parameter_handler): Guard for MSVCR80
+	or greater [#2020].
+
 2013-09-18  Earnie Boyd  <[e-mail]>
 
 	* include/unistd.h (ftruncate()): Guard with no __STRICT_ANSI__ [#2046].

--- a/include/_mingw.h
+++ b/include/_mingw.h
@@ -225,6 +225,12 @@
 #define __MINGW_GNUC_PREREQ(major, minor) \
  (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
 
+/* This will be used to determine if we are using a MSVC versioned library
+ * that provides the symbols being declared.  This could potentially be set
+ * by GCC eventually based on use switch of -msvc=xx or something similar. */ 
+#define __MINGW_MSVCR_PREREQ(runtime) \
+  (defined(__MSVC_RUNTIME__) && (__MSVC_RUNTIME__ >= (runtime)))
+
 #ifdef __cplusplus
 # define __CRT_INLINE inline
 #else

--- a/include/stdio.h
+++ b/include/stdio.h
@@ -410,13 +410,30 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	fseek (FILE*, long, int);
 _CRTIMP long __cdecl __MINGW_NOTHROW	ftell (FILE*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	rewind (FILE*);
 
-_CRTIMP int __cdecl __MINGW_NOTHROW	_fseek_nolock (FILE*, long, int);
-_CRTIMP long __cdecl __MINGW_NOTHROW	_ftell_nolock (FILE*);
-
-_CRTIMP int __cdecl __MINGW_NOTHROW	_fseeki64 (FILE*, __int64, int);
-_CRTIMP __int64 __cdecl __MINGW_NOTHROW	_ftelli64 (FILE*);
-_CRTIMP int __cdecl __MINGW_NOTHROW	_fseeki64_nolock (FILE*, __int64, int);
-_CRTIMP __int64 __cdecl __MINGW_NOTHROW	_ftelli64_nolock (FILE*);
+/* The _nolock is supposed to be nonlocking thread versions, they do not exist
+ * in msvcrt.dll. */
+int __cdecl __MINGW_NOTHROW	_fseek_nolock (FILE*, long, int);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _fseek_nolock(FILE *stream, long offset, int whence)
+{ return fseek(stream, offset, whence); }
+long __cdecl __MINGW_NOTHROW	_ftell_nolock (FILE*);
+_CRTALIAS long __cdecl __MINGW_NOTHROW _ftell_nolock(FILE *stream)
+{ return ftell(stream); }
+
+int __cdecl __MINGW_NOTHROW	_fseeki64 (FILE*, __int64, int);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _fseeki64( FILE *stream, __int64 offset, int whence)
+{ return _lseeki64(_fileno(stream), offset, whence);}
+__int64 __cdecl __MINGW_NOTHROW	_ftelli64 (FILE*);
+_CRTALIAS __int64 __cdecl __MINGW_NOTHROW _ftelli64(FILE *stream)
+{ return _telli64(_fileno(stream)); }
+
+/* The _nolock is supposed to be nonlocking thread versions, they do not exist
+ * in msvcrt.dll. */
+int __cdecl __MINGW_NOTHROW	_fseeki64_nolock (FILE*, __int64, int);
+_CRTALIAS int _fseeki64_nolock (FILE *stream, __int64 offset, int whence)
+{ return _fseeki64(stream, offset, whence); }
+__int64 __cdecl __MINGW_NOTHROW	_ftelli64_nolock (FILE*);
+_CRTALIAS __int64 __cdecl __MINGW_NOTHROW _ftelli64_nolock (FILE *stream)
+{ return _ftelli64(stream); }
 
 #ifdef __USE_MINGW_FSEEK  /* These are in libmingwex.a */
 /*

--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -338,6 +338,7 @@ _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _set_abort_behavior (unsigned int,
 #  define _WRITE_ABORT_MSG 1
 #  define _CALL_REPORTFAULT 2
 
+#if __MINGW_MSVCR_PREREQ(80)
 typedef void
 (* _invalid_parameter_handler) (
     const wchar_t *,
@@ -346,6 +347,7 @@ typedef void
     unsigned int,
     uintptr_t);
 _invalid_parameter_handler _set_invalid_parameter_handler (_invalid_parameter_handler);
+#endif
 
 #ifndef _NO_OLDNAMES
 

--- a/include/unistd.h
+++ b/include/unistd.h
@@ -21,6 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef __STRICT_ANSI__
 #ifndef _UNISTD_H
 #define _UNISTD_H
 #pragma GCC system_header
@@ -60,7 +61,6 @@ extern "C" {
 int __cdecl __MINGW_NOTHROW usleep(useconds_t useconds);
 #endif  /* Not __NO_ISOCEXT */
 
-#ifndef __STRICT_ANSI__
 /* This is defined as a real library function to allow autoconf
    to verify its existence. */
 int ftruncate(int, off_t);
@@ -70,7 +70,6 @@ __CRT_INLINE int ftruncate(int __fd, off_t __length)
   return _chsize (__fd, __length);
 }
 #endif
-#endif /* ndef __STRICT_ANSI__ */
 
 #ifdef __cplusplus
 }
@@ -78,3 +77,4 @@ __CRT_INLINE int ftruncate(int __fd, off_t __length)
 
 #undef __UNISTD_H_SOURCED__
 #endif /* _UNISTD_H */
+#endif /* ndef __STRICT_ANSI__ */