diff options
| author | Paul Eggert | 2011-04-16 15:32:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-16 15:32:35 -0700 |
| commit | 68afa9ca47688981d7d981855c2994d259f7d9ee (patch) | |
| tree | 04ae6ce0157f14367695a4af10d3615da173967c /lib-src | |
| parent | c7b7425e227a08bb85565498e517364fbc96dd2d (diff) | |
| download | emacs-68afa9ca47688981d7d981855c2994d259f7d9ee.tar.gz emacs-68afa9ca47688981d7d981855c2994d259f7d9ee.zip | |
* pop.c: Undo previous change.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 3 | ||||
| -rw-r--r-- | lib-src/pop.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 54582a42e6a..456e286503b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,8 +1,5 @@ | |||
| 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * pop.c (socket_connection): Double-cast to avoid GCC warning | ||
| 4 | about alignment. | ||
| 5 | |||
| 6 | * movemail.c (mail_spool_name): Protoize. | 3 | * movemail.c (mail_spool_name): Protoize. |
| 7 | (main): Remove unused var. Mark var as initialized. | 4 | (main): Remove unused var. Mark var as initialized. |
| 8 | Move locals to avoid shadowing, and use time_t for times. | 5 | Move locals to avoid shadowing, and use time_t for times. |
diff --git a/lib-src/pop.c b/lib-src/pop.c index d1469bd927b..426b39bd1fb 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c | |||
| @@ -1091,8 +1091,7 @@ socket_connection (char *host, int flags) | |||
| 1091 | { | 1091 | { |
| 1092 | if (it->ai_addrlen == sizeof (addr)) | 1092 | if (it->ai_addrlen == sizeof (addr)) |
| 1093 | { | 1093 | { |
| 1094 | struct sockaddr_in *in_a = | 1094 | struct sockaddr_in *in_a = (struct sockaddr_in *) it->ai_addr; |
| 1095 | (struct sockaddr_in *) (void *) it->ai_addr; | ||
| 1096 | memcpy (&addr.sin_addr, &in_a->sin_addr, sizeof (addr.sin_addr)); | 1095 | memcpy (&addr.sin_addr, &in_a->sin_addr, sizeof (addr.sin_addr)); |
| 1097 | if (! connect (sock, (struct sockaddr *) &addr, sizeof (addr))) | 1096 | if (! connect (sock, (struct sockaddr *) &addr, sizeof (addr))) |
| 1098 | break; | 1097 | break; |