libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* assert.cc (__assert_func): New function, to match newlib header 

change.
	* cygwin.din: Export __assert_func.
	* include/cygwin/version.h: Bump API minor number.
This commit is contained in:
Eric Blake 2007-06-27 12:46:35 +00:00
parent 3473e6bd7b
commit 048e00e01d
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-27 Eric Blake <ebb9@byu.net>
* assert.cc (__assert_func): New function, to match newlib header
change.
* cygwin.din: Export __assert_func.
* include/cygwin/version.h: Bump API minor number.
2007-06-21 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (WSAIoctl): Remove.
@ -536,7 +543,7 @@
* Makefile.in (DLL_IMPORTS): Add libntdll.a.
* autoload.cc: Remove all symbols from advapi32.dll, kernel32.dll and
ntdll.dll available on all platforms since NT4.
Throughout remove all usage of wincap.is_winnt.
* dcrt0.cc (dll_crt0_0): Remove call to mmap_init.
* fhandler.h (class fhandler_base): Remove has_changed flag.

19
winsup/cygwin/assert.cc
View File

@ -1,6 +1,6 @@
/* assert.cc: Handle the assert macro for WIN32.
Copyright 1997, 1998, 2000, 2001 Red Hat, Inc.
Copyright 1997, 1998, 2000, 2001, 2007 Red Hat, Inc.
This file is part of Cygwin.
@ -22,6 +22,13 @@ details. */
extern "C" void
__assert (const char *file, int line, const char *failedexpr)
{
__assert_func (file, line, NULL, failedexpr);
}
extern "C" void
__assert_func (const char *file, int line, const char *func,
const char *failedexpr)
{
HANDLE h;
@ -35,15 +42,17 @@ __assert (const char *file, int line, const char *failedexpr)
char *buf;
buf = (char *) alloca (100 + strlen (failedexpr));
__small_sprintf (buf, "Failed assertion\n\t%s\nat line %d of file %s",
failedexpr, line, file);
__small_sprintf (buf, "Failed assertion\n\t%s\nat line %d of file %s%s%s",
failedexpr, line, file,
func ? "\nin function " : "", func ? func : "");
MessageBox (NULL, buf, NULL, MB_OK | MB_ICONERROR | MB_TASKMODAL);
}
else
{
CloseHandle (h);
small_printf ("assertion \"%s\" failed: file \"%s\", line %d\n",
failedexpr, file, line);
small_printf ("assertion \"%s\" failed: file \"%s\", line %d%s%s\n",
failedexpr, file, line,
func ? ", function: " : "", func ? func : "");
}
#ifdef DEBUGGING

1
winsup/cygwin/cygwin.din
View File

@ -118,6 +118,7 @@ _asprintf = asprintf SIGFE
asprintf_r = _asprintf_r SIGFE
_asprintf_r SIGFE
__assert SIGFE
__assert_func SIGFE
__assertfail SIGFE
atan NOSIGFE
_atan = atan NOSIGFE

3
winsup/cygwin/include/cygwin/version.h
View File

@ -313,12 +313,13 @@ details. */
171: Export exp10, exp10f, pow10, pow10f, strcasestr, funopen,
fopencookie.
172: Export getifaddrs, freeifaddrs.
173: Export __assert_func.
*/
/* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
#define CYGWIN_VERSION_API_MAJOR 0
#define CYGWIN_VERSION_API_MINOR 172
#define CYGWIN_VERSION_API_MINOR 173
/* There is also a compatibity version number associated with the
shared memory regions. It is incremented when incompatible