Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 109319:108c259501da | 109320:a0d2db31314d |
|---|---|
| 2261 register struct Lisp_Vector *p; | 2261 register struct Lisp_Vector *p; |
| 2262 | 2262 |
| 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) |
| 2270 { | 2270 { |
| 2271 case AF_INET: | 2271 case AF_INET: |
| 2301 break; | 2301 break; |
| 2302 return make_unibyte_string (sockun->sun_path, i); | 2302 return make_unibyte_string (sockun->sun_path, i); |
| 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)); |
| 2310 cp = (unsigned char *) &sa->sa_family + sizeof (sa->sa_family); | 2310 cp = (unsigned char *) &sa->sa_family + sizeof (sa->sa_family); |
| 2311 break; | 2311 break; |
