Mercurial > emacs
diff src/process.c @ 109320:a0d2db31314d
Use offsetof instead of own definition
* lisp.h: Include <stddef.h>.
(OFFSETOF): Don't define.
(VECSIZE): Use offsetof instead of OFFSETOF.
(PSEUDOVECSIZE): Likewise.
* process.c (conv_sockaddr_to_lisp): Likewise.
* alloc.c: Don't include <stddef.h>.
* buffer.h (PER_BUFFER_VAR_OFFSET): Use offsetof.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sun, 11 Jul 2010 20:34:43 +0200 |
| parents | 108c259501da |
| children | 5b332381f0a9 |
line wrap: on
line diff
--- a/src/process.c Sun Jul 11 20:19:16 2010 +0200 +++ b/src/process.c Sun Jul 11 20:34:43 2010 +0200 @@ -2263,7 +2263,7 @@ /* Workaround for a bug in getsockname on BSD: Names bound to sockets in the UNIX domain are inaccessible; getsockname returns a zero length name. */ - if (len < OFFSETOF (struct sockaddr, sa_family) + sizeof (sa->sa_family)) + if (len < offsetof (struct sockaddr, sa_family) + sizeof (sa->sa_family)) return empty_unibyte_string; switch (sa->sa_family) @@ -2303,7 +2303,7 @@ } #endif default: - len -= OFFSETOF (struct sockaddr, sa_family) + sizeof (sa->sa_family); + len -= offsetof (struct sockaddr, sa_family) + sizeof (sa->sa_family); address = Fcons (make_number (sa->sa_family), Fmake_vector (make_number (len), Qnil)); p = XVECTOR (XCDR (address));
