From 80771a31cd23baeabc0aef7f5ef82b94a5bfad80 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 17 Jun 2011 09:43:02 +0000 Subject: [PATCH] [OSKITTCP] * Fix msvc build. The tcpip driver compiles and links with msvc as a result. svn path=/trunk/; revision=52296 --- reactos/lib/drivers/oskittcp/include/oskitfreebsd.h | 13 ------------- reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h b/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h index f7d48504d5f..e84222709f7 100644 --- a/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h +++ b/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h @@ -17,21 +17,8 @@ extern void oskittcp_die(const char *file, int line); #define ovbcopy(src,dst,n) memmove(dst,src,n) #define bzero(x,y) memset(x,0,y) #define bcopy(src,dst,n) memcpy(dst,src,n) -#ifdef _MSC_VER -static __inline void panic ( const char* fmt, ... ) -{ - va_list arg; - va_start(arg, fmt); - printf ( "oskit PANIC: " ); - vprintf ( fmt, arg ); - va_end(arg); - // TODO FIXME - print stack trace... - oskittcp_die("",-1); -} -#else//_MSC_VER #define panic(...) do { printf(__VA_ARGS__); \ oskittcp_die(__FILE__,__LINE__); } while(0) -#endif//_MSC_VER #define kmem_malloc(x,y,z) malloc(y,0,0) #endif//_OSKITFREEBSD_H diff --git a/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c b/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c index 2bd3c7a4e45..4a9451dacac 100644 --- a/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c +++ b/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c @@ -610,7 +610,7 @@ restart: if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 && (so->so_proto->pr_flags & PR_CONNREQUIRED)) { printf("so: %x\n", so); - __asm__("int3"); + __debugbreak(); error = ENOTCONN; goto release; }