diff options
| author | Andreas Schwab | 2010-07-11 20:34:43 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-07-11 20:34:43 +0200 |
| commit | 89887d672aded197a2be95f3d8a6d5bdcb19eb58 (patch) | |
| tree | fefa168f1ddbc3c0f04f3e891cc20007a65e11a4 /src/process.c | |
| parent | ae96d47a63b32aa752bc65ce08f8b7b7254db3e6 (diff) | |
| download | emacs-89887d672aded197a2be95f3d8a6d5bdcb19eb58.tar.gz emacs-89887d672aded197a2be95f3d8a6d5bdcb19eb58.zip | |
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.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c index ed31657b01c..0fec550ad8f 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2263,7 +2263,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, int len) | |||
| 2263 | /* Workaround for a bug in getsockname on BSD: Names bound to | 2263 | /* Workaround for a bug in getsockname on BSD: Names bound to |
| 2264 | sockets in the UNIX domain are inaccessible; getsockname returns | 2264 | sockets in the UNIX domain are inaccessible; getsockname returns |
| 2265 | a zero length name. */ | 2265 | a zero length name. */ |
| 2266 | if (len < OFFSETOF (struct sockaddr, sa_family) + sizeof (sa->sa_family)) | 2266 | if (len < offsetof (struct sockaddr, sa_family) + sizeof (sa->sa_family)) |
| 2267 | return empty_unibyte_string; | 2267 | return empty_unibyte_string; |
| 2268 | 2268 | ||
| 2269 | switch (sa->sa_family) | 2269 | switch (sa->sa_family) |
| @@ -2303,7 +2303,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, int len) | |||
| 2303 | } | 2303 | } |
| 2304 | #endif | 2304 | #endif |
| 2305 | default: | 2305 | default: |
| 2306 | len -= OFFSETOF (struct sockaddr, sa_family) + sizeof (sa->sa_family); | 2306 | len -= offsetof (struct sockaddr, sa_family) + sizeof (sa->sa_family); |
| 2307 | address = Fcons (make_number (sa->sa_family), | 2307 | address = Fcons (make_number (sa->sa_family), |
| 2308 | Fmake_vector (make_number (len), Qnil)); | 2308 | Fmake_vector (make_number (len), Qnil)); |
| 2309 | p = XVECTOR (XCDR (address)); | 2309 | p = XVECTOR (XCDR (address)); |