X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fsysroot.cpp;h=0158fad2adfc51f83254e48b8e35e72cfa595ab7;hb=740c10d9bf6249d4168d629551d80b031c388b7b;hp=4c0cfdca93506aad994796138c8045249366b771;hpb=27d96c03938f4541364d43b35dc41093b7871f59;p=mingw%2Fmingw-get.git diff --git a/src/sysroot.cpp b/src/sysroot.cpp index 4c0cfdc..0158fad 100644 --- a/src/sysroot.cpp +++ b/src/sysroot.cpp @@ -4,7 +4,7 @@ * $Id$ * * Written by Keith Marshall - * Copyright (C) 2010, MinGW Project + * Copyright (C) 2010, 2011, MinGW Project * * * Implementation of the system map loader, sysroot management and @@ -167,9 +167,9 @@ void pkgXmlDocument::LoadSystemMap() /* This system map is a candidate for loading; * process all of its subsystem specific sysroot declarations... */ -# if DEBUGLEVEL & DEBUG_TRACE_INIT - fprintf( stderr, "Load system map: id = %s\n", id ); -# endif + DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_INIT ), + dmh_printf( "Load system map: id = %s\n", id ) + ); pkgXmlNode *subsystem = sysmap->FindFirstAssociate( sysroot_key ); while( subsystem != NULL ) { @@ -188,11 +188,10 @@ void pkgXmlDocument::LoadSystemMap() && ! samepath( path, sysroot->GetPropVal( pathname_key, NULL )) ) sysroot = sysroot->FindNextAssociate( sysroot_key ); -# if DEBUGLEVEL & DEBUG_TRACE_INIT - fprintf( stderr, "Bind subsystem %s: sysroot = %s\n", + DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_INIT ), + dmh_printf( "Bind subsystem %s: sysroot = %s\n", subsystem->GetPropVal( subsystem_key, "" ), path - ); -# endif + )); if( sysroot == NULL ) {