diff options
| author | Samuel Bronson | 2012-06-24 17:43:09 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-24 17:43:09 +0800 |
| commit | dd1ff7c09a9a1392e66156da667112cc1afadcee (patch) | |
| tree | 233057daef93c731b8559140b3d7ed2b9e5246b7 /lib-src | |
| parent | 6d41a41d81d60e8a351e85656ba71c99ab8f6bf5 (diff) | |
| download | emacs-dd1ff7c09a9a1392e66156da667112cc1afadcee.tar.gz emacs-dd1ff7c09a9a1392e66156da667112cc1afadcee.zip | |
* emacsclient.c (set_local_socket): Fix a compiler warning.
Fixes: debbugs:7838
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 571f98b8a8d..e3232a46f3c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-24 Samuel Bronson <naesten@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * emacsclient.c (set_local_socket): Fix compiler warning (Bug#7838). | ||
| 4 | |||
| 1 | 2012-06-22 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-06-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Support higher-resolution time stamps (Bug#9000). | 7 | Support higher-resolution time stamps (Bug#9000). |
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 29504445407..f8e81256101 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -1278,7 +1278,7 @@ set_local_socket (const char *local_socket_name) | |||
| 1278 | if (n > 0) | 1278 | if (n > 0) |
| 1279 | { | 1279 | { |
| 1280 | tmpdir = tmpdir_storage = xmalloc (n); | 1280 | tmpdir = tmpdir_storage = xmalloc (n); |
| 1281 | confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n); | 1281 | confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir_storage, n); |
| 1282 | } | 1282 | } |
| 1283 | else | 1283 | else |
| 1284 | #endif | 1284 | #endif |