From: cherierm Date: Fri, 29 Sep 2006 09:17:58 +0000 (+0000) Subject: Relocate connected socket macros in Windows configuration file win32/config.h. X-Git-Tag: v3.3~2511 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b92cf3fa72c82cad5ba0f97d7d30b868f8fc334b?ds=sidebyside Relocate connected socket macros in Windows configuration file win32/config.h. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2848 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h index 9b37148ad3..4b4d140525 100644 --- a/src/win32/compiler/borland.h +++ b/src/win32/compiler/borland.h @@ -406,54 +406,5 @@ the double. For now, GRAS requires the structures to be compacted. */ typedef unsigned int uint32_t; typedef int socklen_t; -#define tcp_read( s, buf, len ) recv( s, buf, len, 0 ) -#define tcp_write( s, buf, len ) send( s, buf, len, 0 ) -#define ioctl( s, c, a ) ioctlsocket( (s), (c), (a) ) -#define ioctl_t u_long -#define AC_SOCKET_INVALID ((unsigned int) ~0) - -#ifdef SD_BOTH - #define tcp_close(s) (shutdown( s, SD_BOTH ), closesocket(s)) -#else - #define tcp_close( s ) closesocket( s ) -#endif - -#ifndef EWOULDBLOCK - #define EWOULDBLOCK WSAEWOULDBLOCK -#endif - -#ifndef EINPROGRESS - #define EINPROGRESS WSAEINPROGRESS -#endif - -#ifndef ETIMEDOUT - #define ETIMEDOUT WSAETIMEDOUT -#endif - -#ifdef sock_errno - #undef sock_errno -#endif - -#define sock_errno WSAGetLastError() - -#ifdef sock_errstr - #undef sock_errstr -#endif - -#define sock_errstr(err) gras_wsa_err2string(err) - -const char *gras_wsa_err2string(int errcode); - -#ifdef S_IRGRP - #undef S_IRGRP -#endif - -#define S_IRGRP 0 - -#ifdef S_IWGRP - #undef S_IWGRP -#endif - -#define S_IWGRP 0 #endif /* #ifndef __XBT_BORLAND_COMPILER_CONFIG_H__ */ \ No newline at end of file