JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/_mingw.h: Add __MINGW_VERSION, __MINGW_MAJOR_VERSION,

Browse Source 
__MINGW_MINOR_VERSION and __MINGW_PATCHLEVEL deprecating the __MINGW32_*
	versions of the macros.
	* configure.in: Use __MINGW_VERSION instead of __MINGW32_VERSION.
	* configure: Ditto.
This commit is contained in:
Earnie Boyd 2012-07-30 14:49:16 +00:00
parent 31938000a5
commit 67b37a26aa
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/mingw/ChangeLog
View File

@ -4,6 +4,11 @@
_WIN64 is defined. _WIN64 is defined.
* include/inttypes.h: A few items like PRNdPTR and SCNdPTR need 64 * include/inttypes.h: A few items like PRNdPTR and SCNdPTR need 64
bitness specified when _WIN64 is defined. bitness specified when _WIN64 is defined.
* include/_mingw.h: Add __MINGW_VERSION, __MINGW_MAJOR_VERSION,
__MINGW_MINOR_VERSION and __MINGW_PATCHLEVEL deprecating the __MINGW32_*
versions of the macros.
* configure.in: Use __MINGW_VERSION instead of __MINGW32_VERSION.
* configure: Ditto.
2012-05-08 Keith Marshall <keithmarshall@users.sourceforge.net> 2012-05-08 Keith Marshall <keithmarshall@users.sourceforge.net>

2
winsup/mingw/configure vendored
View File

@ -1788,7 +1788,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:$LINENO: checking package version" >&5 { $as_echo "$as_me:$LINENO: checking package version" >&5
$as_echo_n "checking package version... " >&6; } $as_echo_n "checking package version... " >&6; }
PACKAGE_VERSION=`awk '$2 == "'"__MINGW32_VERSION"'" { print $3 }' ${srcdir}/include/_mingw.h` PACKAGE_VERSION=`awk '$2 == "'"__MINGW_VERSION"'" { print $3 }' ${srcdir}/include/_mingw.h`
{ $as_echo "$as_me:$LINENO: result: $PACKAGE_VERSION" >&5 { $as_echo "$as_me:$LINENO: result: $PACKAGE_VERSION" >&5
$as_echo "$PACKAGE_VERSION" >&6; } $as_echo "$PACKAGE_VERSION" >&6; }

2
winsup/mingw/configure.in
View File

@ -18,7 +18,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_INIT([MinGW Runtime], [v3.x], [http://mingw.org/reporting_bugs], [mingwrt]) AC_INIT([MinGW Runtime], [v3.x], [http://mingw.org/reporting_bugs], [mingwrt])
MINGW_AC_CONFIG_SRCDIR([__MINGW32_VERSION], [include/_mingw.h]) MINGW_AC_CONFIG_SRCDIR([__MINGW_VERSION], [include/_mingw.h])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
GCC_NO_EXECUTABLES GCC_NO_EXECUTABLES

15
winsup/mingw/include/_mingw.h
View File

@ -22,6 +22,13 @@
*/ */
#define __MINGW_H #define __MINGW_H
#define __MINGW_VERSION 4
#define __MINGW_MAJOR_VERSION 0
#define __MINGW_MINOR_VERSION 0
#define __MINGW_PATCHLEVEL 0
// These four macros are deprecated and will be removed in the next major
// version release.
#define __MINGW32_VERSION 3.20 #define __MINGW32_VERSION 3.20
#define __MINGW32_MAJOR_VERSION 3 #define __MINGW32_MAJOR_VERSION 3
#define __MINGW32_MINOR_VERSION 20 #define __MINGW32_MINOR_VERSION 20
@ -40,10 +47,10 @@
__MINGW_IMPORT The attribute definition to specify imported __MINGW_IMPORT The attribute definition to specify imported
variables/functions. variables/functions.
_CRTIMP As above. For MS compatibility. _CRTIMP As above. For MS compatibility.
__MINGW32_VERSION Runtime version. __MINGW_VERSION Runtime version.
__MINGW32_MAJOR_VERSION Runtime major version. __MINGW_MAJOR_VERSION Runtime major version.
__MINGW32_MINOR_VERSION Runtime minor version. __MINGW_MINOR_VERSION Runtime minor version.
__MINGW32_BUILD_DATE Runtime build date. __MINGW_BUILD_DATE Runtime build date.
Macros to enable MinGW features which deviate from standard MSVC Macros to enable MinGW features which deviate from standard MSVC
compatible behaviour; these may be specified directly in user code, compatible behaviour; these may be specified directly in user code,