Author: akhaldi Date: Fri Jun 17 09:43:02 2011 New Revision: 52296
URL: http://svn.reactos.org/svn/reactos?rev=52296&view=rev Log: [OSKITTCP] * Fix msvc build. The tcpip driver compiles and links with msvc as a result.
Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c
Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/includ... ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Fri Jun 17 09:43:02 2011 @@ -17,21 +17,8 @@ #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("<unknown file>",-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
Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskitt... ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Fri Jun 17 09:43:02 2011 @@ -610,7 +610,7 @@ 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; }