* ctype.h (__mb_cur_max): Define as __mb_cur_max for the _MSVCRT_ special case. * stdlib.h: Remove the duplicated and typographically erroneous __mbcur_max macros. Make the entries identical to the ctype.h counterparts. (__mb_cur_max): Define as __mb_cur_max for the _MSVCRT_ special case. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4175 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/crt/ChangeLog b/mingw-w64-headers/crt/ChangeLog index 9757c48..616f965 100644 --- a/mingw-w64-headers/crt/ChangeLog +++ b/mingw-w64-headers/crt/ChangeLog
@@ -1,15 +1,22 @@ +2011-05-23 Ozkan Sezer <sezeroz@gmail.com> + + * ctype.h (__mb_cur_max): Define as __mb_cur_max for the _MSVCRT_ + special case. + * stdlib.h: Remove the duplicated and typographically erroneous + __mbcur_max macros. Make the entries identical to the ctype.h + counterparts. + (__mb_cur_max): Define as __mb_cur_max for the _MSVCRT_ special case. + 2011-05-12 Jonathan Yong <jon_y@users.sourceforge.net> * stdio.h (ftello64): Fix longstanding typo that caused define to be - shadowed. Patch by Komisar (http://komisar.gin.by/). - + shadowed. Patch by Komisar (http://komisar.gin.by/). 2011-05-05 Jonathan Yong <jon_y@users.sourceforge.net> * stdlib.h (swab): Use define guards. * unistd.h (swab): Copy from stdlib.h as per POSIX spec. - 2011-03-25 Kai Tietz <ktietz70@googlemail.com> * string.h, memory.h: Add mempcpy prototype.
diff --git a/mingw-w64-headers/crt/ctype.h b/mingw-w64-headers/crt/ctype.h index 2d4fe82..eb69877 100644 --- a/mingw-w64-headers/crt/ctype.h +++ b/mingw-w64-headers/crt/ctype.h
@@ -189,9 +189,10 @@ #ifndef __mb_cur_max #ifdef _MSVCRT_ extern int __mb_cur_max; +#define __mb_cur_max __mb_cur_max #else extern int * __MINGW_IMP_SYMBOL(__mb_cur_max); -#define __mb_cur_max (* __MINGW_IMP_SYMBOL(__mb_cur_max)) +#define __mb_cur_max (* __MINGW_IMP_SYMBOL(__mb_cur_max)) #endif #endif #define ___mb_cur_max_func() (__mb_cur_max)
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h index d0dec16..6057e09 100644 --- a/mingw-w64-headers/crt/stdlib.h +++ b/mingw-w64-headers/crt/stdlib.h
@@ -96,18 +96,13 @@ #ifndef __mb_cur_max #ifdef _MSVCRT_ extern int __mb_cur_max; +#define __mb_cur_max __mb_cur_max #else extern int * __MINGW_IMP_SYMBOL(__mb_cur_max); #define __mb_cur_max (* __MINGW_IMP_SYMBOL(__mb_cur_max)) #endif #endif -#ifdef _MSVCRT_ - extern int __mbcur_max; #define ___mb_cur_max_func() (__mb_cur_max) -#else - extern int* __MINGW_IMP_SYMBOL(__mbcur_max); -#define ___mb_cur_max_func() (* __MINGW_IMP_SYMBOL(__mb_cur_max)) -#endif #endif #define __max(a,b) (((a) > (b)) ? (a) : (b))