diff options
| author | Andreas Schwab | 2010-06-04 00:47:35 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-06-04 00:47:35 +0200 |
| commit | 0eb7675e675e6b3c241e13dca1b9be898b534924 (patch) | |
| tree | cf29daec1edbdc8d02dd55a802bcc5d6aa93d39b /src | |
| parent | 988b91ce8f6f84e03123bf7d3eb31f1c7ecbcef0 (diff) | |
| download | emacs-0eb7675e675e6b3c241e13dca1b9be898b534924.tar.gz emacs-0eb7675e675e6b3c241e13dca1b9be898b534924.zip | |
* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
address.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5ce7e4a11b2..79fde00d9ad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-06-03 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4 | ||
| 4 | address. | ||
| 5 | |||
| 1 | 2010-06-03 Juanma Barranquero <lekktu@gmail.com> | 6 | 2010-06-03 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * ccl.c (Fccl_program_p): Fix typo in docstring. | 8 | * ccl.c (Fccl_program_p): Fix typo in docstring. |
diff --git a/src/process.c b/src/process.c index 53cc42f223e..7adc114075e 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2540,9 +2540,11 @@ conv_lisp_to_sockaddr (family, address, sa, len) | |||
| 2540 | ip6[i] = ntohs (j); | 2540 | ip6[i] = ntohs (j); |
| 2541 | } | 2541 | } |
| 2542 | sa->sa_family = family; | 2542 | sa->sa_family = family; |
| 2543 | return; | ||
| 2543 | } | 2544 | } |
| 2544 | #endif | 2545 | #endif |
| 2545 | return; | 2546 | else |
| 2547 | return; | ||
| 2546 | } | 2548 | } |
| 2547 | else if (STRINGP (address)) | 2549 | else if (STRINGP (address)) |
| 2548 | { | 2550 | { |