alpha-conversion pour eviter un clash bizarre sur Rhapsody

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3292 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 22 insertions, 22 deletions

diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c
index ae1d6952f9..1cc7a7af77 100644
--- a/otherlibs/unix/socketaddr.c
+++ b/otherlibs/unix/socketaddr.c
@@ -38,24 +38,24 @@ value alloc_inet_addr(uint32 a)
   return res;
 }
 
-void get_sockaddr(value mladdr,
-                  union sock_addr_union * addr /*out*/,
-                  socklen_param_type * addr_len /*out*/)
+void get_sockaddr(value mladr,
+                  union sock_addr_union * adr /*out*/,
+                  socklen_param_type * adr_len /*out*/)
 {
-  switch(Tag_val(mladdr)) {
+  switch(Tag_val(mladr)) {
 #ifndef _WIN32
   case 0:                       /* ADDR_UNIX */
     { value path;
       mlsize_t len;
-      path = Field(mladdr, 0);
+      path = Field(mladr, 0);
       len = string_length(path);
-      addr->s_unix.sun_family = AF_UNIX;
-      if (len >= sizeof(addr->s_unix.sun_path)) {
+      adr->s_unix.sun_family = AF_UNIX;
+      if (len >= sizeof(adr->s_unix.sun_path)) {
         unix_error(ENAMETOOLONG, "", path);
       }
-      bcopy(String_val(path), addr->s_unix.sun_path, (int) len + 1);
-      *addr_len =
-        ((char *)&(addr->s_unix.sun_path) - (char *)&(addr->s_unix))
+      bcopy(String_val(path), adr->s_unix.sun_path, (int) len + 1);
+      *adr_len =
+        ((char *)&(adr->s_unix.sun_path) - (char *)&(adr->s_unix))
         + len;
       break;
     }
@@ -64,26 +64,26 @@ void get_sockaddr(value mladdr,
     {
       char * p;
       int n;
-      for (p = (char *) &addr->s_inet, n = sizeof(addr->s_inet);
+      for (p = (char *) &adr->s_inet, n = sizeof(adr->s_inet);
            n > 0; p++, n--)
         *p = 0;
-      addr->s_inet.sin_family = AF_INET;
-      addr->s_inet.sin_addr.s_addr = GET_INET_ADDR(Field(mladdr, 0));
-      addr->s_inet.sin_port = htons(Int_val(Field(mladdr, 1)));
-      *addr_len = sizeof(struct sockaddr_in);
+      adr->s_inet.sin_family = AF_INET;
+      adr->s_inet.sin_addr.s_addr = GET_INET_ADDR(Field(mladr, 0));
+      adr->s_inet.sin_port = htons(Int_val(Field(mladr, 1)));
+      *adr_len = sizeof(struct sockaddr_in);
       break;
     }
   }
 }
 
-value alloc_sockaddr(union sock_addr_union * addr /*in*/,
-                     socklen_param_type addr_len)
+value alloc_sockaddr(union sock_addr_union * adr /*in*/,
+                     socklen_param_type adr_len)
 {
   value res;
-  switch(addr->s_gen.sa_family) {
+  switch(adr->s_gen.sa_family) {
 #ifndef _WIN32
   case AF_UNIX:
-    { value n = copy_string(addr->s_unix.sun_path);
+    { value n = copy_string(adr->s_unix.sun_path);
       Begin_root (n);
         res = alloc_small(1, 0);
         Field(res,0) = n;
@@ -92,11 +92,11 @@ value alloc_sockaddr(union sock_addr_union * addr /*in*/,
     }
 #endif
   case AF_INET:
-    { value a = alloc_inet_addr(addr->s_inet.sin_addr.s_addr);
+    { value a = alloc_inet_addr(adr->s_inet.sin_addr.s_addr);
       Begin_root (a);
         res = alloc_small(2, 1);
         Field(res,0) = a;
-        Field(res,1) = Val_int(ntohs(addr->s_inet.sin_port));
+        Field(res,1) = Val_int(ntohs(adr->s_inet.sin_port));
       End_roots();
       break;
     }
diff --git a/utils/config.mlp b/utils/config.mlp
index fcc7854c91..9d94fb1e3f 100644
--- a/utils/config.mlp
+++ b/utils/config.mlp
@@ -12,7 +12,7 @@
 
 (* $Id$ *)
 
-let version = "3.00+10 (2000-08-04)"
+let version = "3.00+11 (2000-09-01)"
 
 let standard_library =
   try