diff options
author | K. Handa <handa@gnu.org> | 2016-06-01 08:07:18 +0900 |
---|---|---|
committer | K. Handa <handa@gnu.org> | 2016-06-01 08:07:18 +0900 |
commit | 4efef3db2fb1c3a20b83a67948e614d9b0c258dd (patch) | |
tree | c0c08fc308869f7ba3d988594e4a51b69a70325b /lib-src/emacsclient.c | |
parent | 694d5e5b56a9d55023ffc292188bd88f6f6cbca6 (diff) | |
parent | 01030eed9395f5004e7d0721394697d1ca90cc2f (diff) | |
download | emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.tar.gz emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.tar.bz2 emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.zip |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r-- | lib-src/emacsclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index aab9c4b62f5..7792d0a2c74 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1195,7 +1195,7 @@ set_local_socket (const char *local_socket_name) int use_tmpdir = 0; int saved_errno; const char *server_name = local_socket_name; - const char *tmpdir IF_LINT ( = NULL); + const char *tmpdir; char *tmpdir_storage = NULL; char *socket_name_storage = NULL; |