* include/_mingw.h (__MINGW_ATTRIB_NONNULL): Don't define as

variadic macro.
	* mingwex/mbrtowc.c (__mbrtowc_cp): Use __MINGW_ATTRIB_NONNULL.
	Remove unused MBTOWC_FLAGS define.
This commit is contained in:
Danny Smith
2005-05-02 08:03:34 +00:00
parent 05726ddd86
commit 38efa5f128
3 changed files with 14 additions and 15 deletions

View File

@ -136,11 +136,13 @@
#define __MINGW_ATTRIB_PURE
#endif
/* Attribute `nonnull' was valid as of gcc 3.3. */
/* Attribute `nonnull' was valid as of gcc 3.3. We don't use GCC's
variadiac macro facility, because variadic macros causes syntax
errors with --traditional-cpp. */
#if (__GNUC__ > 3 ||( __GNUC__ == 3 && __GNUC_MINOR >= 3))
#define __MINGW_ATTRIB_NONNULL(args...) __attribute__ ((__nonnull__ (args)))
#define __MINGW_ATTRIB_NONNULL(arg) __attribute__ ((__nonnull__ (arg)))
#else
#define __MINGW_ATTRIB_NONNULL(args...)
#define __MINGW_ATTRIB_NONNULL(arg)
#endif /* GNUC >= 3.3 */
#ifndef __MSVCRT_VERSION__