--- mstools/h/assert.h 2018/08/09 18:21:03 1.1.1.2 +++ mstools/h/assert.h 2018/08/09 18:22:57 1.1.1.3 @@ -1,7 +1,7 @@ /*** *assert.h - define the assert macro * -* Copyright (c) 1985-1992, Microsoft Corporation. All rights reserved. +* Copyright (c) 1985-1993, Microsoft Corporation. All rights reserved. * *Purpose: * Defines the assert(exp) macro. @@ -22,15 +22,6 @@ #define _CRTAPI1 __cdecl #define _CRTAPI2 __cdecl -#elif ( _MSC_VER == 600 ) - -/* - * Definitions for old MS C6-386 compiler - */ -#define _CRTAPI1 _cdecl -#define _CRTAPI2 _cdecl -#define _M_IX86 300 - #else /* @@ -57,6 +48,7 @@ void _CRTAPI1 _assert(void *, void *, un } #endif -#define assert(exp) if (exp) {(void)0;} else {_assert(#exp,__FILE__,__LINE__);} +#define assert(exp) (void)( (exp) || (_assert(#exp, __FILE__, __LINE__), 0) ) + #endif /* NDEBUG */