diff --git a/THANKS b/THANKS index 43a55b874..976709e43 100644 --- a/THANKS +++ b/THANKS @@ -6,6 +6,7 @@ The Guile core distribution: Bug reports and fixes from: + Lauri Alanko Greg Badros Aleksandar Bakic Per Bothner diff --git a/libguile/ChangeLog b/libguile/ChangeLog index f3ef66def..fb144ddb7 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,8 @@ 1998-04-12 Mikael Djurfeldt + * socket.c: Check for HAVE_UNIX_DOMAIN_SOCKETS instead of + UNIX_DOMAIN_SOCKETS. (Thanks to Lauri Alanko.) + * gc.c (scm_gc_sweep): Count cells correctly. (Thanks to Ben Caradoc-Davies.) diff --git a/libguile/socket.c b/libguile/socket.c index acb2aefc5..d1f59c122 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -57,7 +57,7 @@ #endif #include #include -#ifdef UNIX_DOMAIN_SOCKETS +#ifdef HAVE_UNIX_DOMAIN_SOCKETS #include #endif #include @@ -355,7 +355,7 @@ scm_fill_sockaddr (fam, address, args, which_arg, proc, size) *size = sizeof (struct sockaddr_in); return (struct sockaddr *) soka; } -#ifdef UNIX_DOMAIN_SOCKETS +#ifdef HAVE_UNIX_DOMAIN_SOCKETS case AF_UNIX: { struct sockaddr_un *soka; @@ -458,7 +458,7 @@ scm_addr_vector (address, proc) short int fam = address->sa_family; SCM result; SCM *ve; -#ifdef UNIX_DOMAIN_SOCKETS +#ifdef HAVE_UNIX_DOMAIN_SOCKETS if (fam == AF_UNIX) { struct sockaddr_un *nad = (struct sockaddr_un *) address; @@ -496,7 +496,7 @@ static void scm_init_addr_buffer () { scm_addr_buffer_size = -#ifdef UNIX_DOMAIN_SOCKETS +#ifdef HAVE_UNIX_DOMAIN_SOCKETS (int) sizeof (struct sockaddr_un) #else 0