Commit: 1d9d68e1214ff0588f91aba60b82d3b612044bdc - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

Commit MetaInfo

• Revisão: 1d9d68e1214ff0588f91aba60b82d3b612044bdc (tree)
• Hora: 2016-09-15 05:26:25
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Mensagem de Log

Relax strict ISO-C conformity to facilitate C99 support.

Mudança Sumário

• modified: mingwrt/ChangeLog
• modified: mingwrt/include/stdlib.h

Diff

--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Relax strict ISO-C conformity to facilitate C99 support.
+
+	* include/stdlib.h (_atoi64, _exit) [__STRICT_ANSI__]: Convention
+	dictates that the Microsoft specific functions should not be declared;
+	however, C99 provides equivalents in atoll() and _Exit(), for which we
+	gratuituously use them to provide inline implementations; thus...
+	[_ISOC99_SOURCE && !__NO_INLINE__]: ...declare them anyway.
+
 2016-09-13  Keith Marshall  <[e-mail]>
 
 	Suppress expected header warnings when running testsuite.

--- a/mingwrt/include/stdlib.h
+++ b/mingwrt/include/stdlib.h
@@ -522,6 +522,22 @@ typedef struct { long quot, rem; } ldiv_t;
 _CRTIMP __cdecl __MINGW_NOTHROW  div_t div (int, int) __MINGW_ATTRIB_CONST;
 _CRTIMP __cdecl __MINGW_NOTHROW  ldiv_t ldiv (long, long) __MINGW_ATTRIB_CONST;
 
+#if !defined __STRICT_ANSI__ || (defined _ISOC99_SOURCE && !defined __NO_INLINE__)
+/* Although not nominally valid in "__STRICT_ANSI__" mode, when compiling C99
+ * source, we use Microsoft's _exit() function to facilitate our provision of
+ * an inline implementation of ISO-C99's _Exit() function.
+ */
+_CRTIMP __cdecl __MINGW_NOTHROW  void _exit (int) __MINGW_ATTRIB_NORETURN;
+
+#ifdef __MSVCRT__
+/* Similarly, we use Microsoft's MSVCRT.DLL specific _atoi64() function,
+ * to facilitate an inline implementation of ISO-C99's atoll() function.
+ */
+_CRTIMP __cdecl __MINGW_NOTHROW  __int64 _atoi64 (const char *);
+
+#endif	/* __MSVCRT__ */
+#endif	/* !__STRICT_ANSI__ || (_ISOC99_SOURCE && !__NO_INLINE__) */
+
 #if !defined (__STRICT_ANSI__)
 /* NOTE: Officially the three following functions are obsolete. The Win32 API
  *       functions SetErrorMode, Beep and Sleep are their replacements.
@@ -531,8 +547,6 @@ _CRTIMP __cdecl __MINGW_NOTHROW  void _beep (unsigned int, unsigned int) __MINGW
 _CRTIMP __cdecl __MINGW_NOTHROW  void _seterrormode (int) __MINGW_ATTRIB_DEPRECATED;
 _CRTIMP __cdecl __MINGW_NOTHROW  void _sleep (unsigned long) __MINGW_ATTRIB_DEPRECATED;
 
-_CRTIMP __cdecl __MINGW_NOTHROW  void _exit (int) __MINGW_ATTRIB_NORETURN;
-
 /* _onexit is a Microsoft extension. Use atexit for portability. */
 /* Note: This is in startup code, not imported directly from dll */
 typedef  int (* _onexit_t)(void);
@@ -562,7 +576,6 @@ _CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_ltow (long, wchar_t *, int);
 _CRTIMP __cdecl __MINGW_NOTHROW  wchar_t *_ultow (unsigned long, wchar_t *, int);
 
 #ifdef __MSVCRT__
-_CRTIMP __cdecl __MINGW_NOTHROW  __int64 _atoi64 (const char *);
 _CRTIMP __cdecl __MINGW_NOTHROW  char* _i64toa (__int64, char *, int);
 _CRTIMP __cdecl __MINGW_NOTHROW  char* _ui64toa (unsigned __int64, char *, int);
 _CRTIMP __cdecl __MINGW_NOTHROW  __int64 _wtoi64 (const wchar_t *);