Fix build. Deleted: trunk/reactos/lib/iphlpapi/debug.h Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____
Deleted: trunk/reactos/lib/iphlpapi/debug.h --- trunk/reactos/lib/iphlpapi/debug.h 2005-06-20 21:45:19 UTC (rev 16189) +++ trunk/reactos/lib/iphlpapi/debug.h 2005-06-20 21:49:00 UTC (rev 16190) @@ -1,59 +0,0 @@
-/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock 2 Helper DLL for TCP/IP - * FILE: include/debug.h - * PURPOSE: Debugging support macros - * DEFINES: DBG - Enable debug output - * NASSERT - Disable assertions - */ -#ifndef __DEBUG_H -#define __DEBUG_H - -#define NORMAL_MASK 0x000000FF -#define SPECIAL_MASK 0xFFFFFF00 -#define MIN_TRACE 0x00000001 -#define MID_TRACE 0x00000002 -#define MAX_TRACE 0x00000003 - -#define DEBUG_ULTRA 0xFFFFFFFF - -#ifdef DBG - -extern DWORD DebugTraceLevel; - -#define WSH_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x_; \ - } - -#if 0 -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { WSH_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); ExitProcess(0); } -#endif /* NASSERT */ - -#endif - -#else /* DBG */ - -#define WSH_DbgPrint(_t_, _x_) - -/*#define ASSERT(x)*/ - -#endif /* DBG */ - -#define CHECKPOINT \ - WSH_DbgPrint(MIN_TRACE, ("\n")); - -#define CP CHECKPOINT - -#endif /* __DEBUG_H */ - -/* EOF */ _____
Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-06-20 21:45:19 UTC (rev 16189) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-06-20 21:49:00 UTC (rev 16190) @@ -38,9 +38,10 @@
*/ #include "iphlpapi_private.h" #include "ifenum.h" +#include <assert.h>
#define NDEBUG -#include <debug.h> +#include "debug.h"
/* Globals */ const PWCHAR TcpFileName = L"\Device\Tcp"; @@ -155,7 +156,7 @@ * stabilizes. */ do { - ASSERT( !entitySet ); /* We must not have an entity set allocated */ + assert( !entitySet ); /* We must not have an entity set allocated */ status = DeviceIoControl( tcpFile, IOCTL_TCP_QUERY_INFORMATION_EX, &req,