diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1997-08-26 15:20:55 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1997-08-26 15:20:55 +0000 |
| commit | b3a5477df08cd49f0ca62a577973cfe134dd2e3a (patch) | |
| tree | 21b2c90b06465374b03d3f931cd61530482184b6 /otherlibs/unix | |
| parent | 579e1523e94f7fef3d11346207161beea667b9dc (diff) | |
Ne definir sock_addr et sock_addr_len qu'une seule fois
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1690 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/unix')
| -rw-r--r-- | otherlibs/unix/socketaddr.c | 3 | ||||
| -rw-r--r-- | otherlibs/unix/socketaddr.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c index 3ef205be1..d4485eeb7 100644 --- a/otherlibs/unix/socketaddr.c +++ b/otherlibs/unix/socketaddr.c @@ -27,6 +27,9 @@ #define EAFNOSUPPORT WSAEAFNOSUPPORT #endif +union sock_addr_union sock_addr; +int sock_addr_len; + value alloc_inet_addr(a) unsigned int a; { diff --git a/otherlibs/unix/socketaddr.h b/otherlibs/unix/socketaddr.h index 52245ed92..65c1a4782 100644 --- a/otherlibs/unix/socketaddr.h +++ b/otherlibs/unix/socketaddr.h @@ -18,13 +18,14 @@ #include <netinet/in.h> #include <arpa/inet.h> -union { +union sock_addr_union { struct sockaddr s_gen; struct sockaddr_un s_unix; struct sockaddr_in s_inet; -} sock_addr; +}; -int sock_addr_len; +extern union sock_addr_union sock_addr; +extern int sock_addr_len; void get_sockaddr P((value)); value alloc_sockaddr P((void)); |