diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2011-05-23 05:01:18 +0400 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2011-05-23 05:01:18 +0400 |
| commit | ecf22d8044853b539293a3d0bdc3fee85de51f97 (patch) | |
| tree | 23f875db843a4e1839db9d7afd4c3fc6685afffa /winsup/mingw | |
| parent | ec2b3046a14968721444f98471f7373b5056dc0c (diff) | |
2011-05-22 Antoine LECA <antoinel@users.sourceforge.net>
* include/_mingw.h: Define GCC system_header only if PCC is not defined.
* include/stdlib.h: Fix a long-standing typo which prevented correct use of
the MB_CUR_MAX macro/variable when DECLSPEC is not supported and <stdlib.h>
is included before <ctype.h>.
Diffstat (limited to 'winsup/mingw')
| -rw-r--r-- | winsup/mingw/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/mingw/include/_mingw.h | 2 | ||||
| -rw-r--r-- | winsup/mingw/include/stdlib.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 954486b5a..33dcf9715 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,10 @@ +2011-05-22 Antoine LECA <antoinel@users.sourceforge.net> + + * include/_mingw.h: Define GCC system_header only if PCC is not defined. + * include/stdlib.h: Fix a long-standing typo which prevented correct use of + the MB_CUR_MAX macro/variable when DECLSPEC is not supported and <stdlib.h> + is included before <ctype.h>. + 2011-05-22 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> * include/wchar.h: Include stdio.h to grab definition of FILENAME_MAX. diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h index 63d6caa22..7648a3106 100644 --- a/winsup/mingw/include/_mingw.h +++ b/winsup/mingw/include/_mingw.h @@ -28,8 +28,10 @@ #define __MINGW32_PATCHLEVEL 0 #if __GNUC__ >= 3 +#ifndef __PCC__ #pragma GCC system_header #endif +#endif /* These are defined by the user (or the compiler) to specify how identifiers are imported from a DLL. diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h index 9fe23bfd9..55455a276 100644 --- a/winsup/mingw/include/stdlib.h +++ b/winsup/mingw/include/stdlib.h @@ -117,10 +117,10 @@ __MINGW_IMPORT char** __argv_dll; #else /* ! __DECLSPEC_SUPPORTED */ # ifdef __MSVCRT__ - extern int* _imp____mbcur_max; + extern int* _imp____mb_cur_max; # define MB_CUR_MAX (*_imp____mb_cur_max) # else /* not __MSVCRT */ - extern int* _imp____mbcur_max_dll; + extern int* _imp____mb_cur_max_dll; # define MB_CUR_MAX (*_imp____mb_cur_max_dll) # endif /* not __MSVCRT */ #endif /* __DECLSPEC_SUPPORTED */ |