diff options
| author | Andreas Schwab | 2010-06-10 00:08:50 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-06-10 00:08:50 +0200 |
| commit | 639b2760f19231881f753c8f1f7822eab457c751 (patch) | |
| tree | e18ffb6ca9d3ed2ad8cf2e38de2caa44e52efaaa /src/process.c | |
| parent | c1b1acc2f7a3b658407afe4562a88ea8c62671d9 (diff) | |
| parent | e454a4a330cc6524cf0d2604b4fafc32d5bda795 (diff) | |
| download | emacs-639b2760f19231881f753c8f1f7822eab457c751.tar.gz emacs-639b2760f19231881f753c8f1f7822eab457c751.zip | |
Merge from emacs-23
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index acc13ea199b..22b85ff5910 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2487,9 +2487,11 @@ conv_lisp_to_sockaddr (family, address, sa, len) | |||
| 2487 | ip6[i] = ntohs (j); | 2487 | ip6[i] = ntohs (j); |
| 2488 | } | 2488 | } |
| 2489 | sa->sa_family = family; | 2489 | sa->sa_family = family; |
| 2490 | return; | ||
| 2490 | } | 2491 | } |
| 2491 | #endif | 2492 | #endif |
| 2492 | return; | 2493 | else |
| 2494 | return; | ||
| 2493 | } | 2495 | } |
| 2494 | else if (STRINGP (address)) | 2496 | else if (STRINGP (address)) |
| 2495 | { | 2497 | { |