* Merge in cygwin-64bit-branch.

This commit is contained in:
Corinna Vinschen
2013-04-23 09:44:36 +00:00
parent 1875ee55d3
commit 61522196c7
253 changed files with 10632 additions and 5055 deletions

View File

@@ -37,7 +37,7 @@ strace::activate (bool isfork)
if (!_active && being_debugged ())
{
char buf[30];
__small_sprintf (buf, "cYg%8x %x %d", _STRACE_INTERFACE_ACTIVATE_ADDR, &_active, isfork);
__small_sprintf (buf, "cYg%8x %lx %d", _STRACE_INTERFACE_ACTIVATE_ADDR, &_active, isfork);
OutputDebugString (buf);
if (_active)
{
@@ -223,7 +223,7 @@ strace::write (unsigned category, const char *buf, int count)
}
void
strace::write_childpid (DWORD pid)
strace::write_childpid (pid_t pid)
{
char buf[30];