Merge from emacs-23

2 files changed, 8 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e402fe44f94..d1745a893bf 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * emacsclient.c (set_local_socket) [DARWIN_OS]: Add fall-back
+        definition of _CS_DARWIN_USER_TEMP_DIR for Mac OS X 10.4 and older.
+
 2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * test-distrib.c: Remove include guards for config.h and fcntl.h.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index b60b2661805..48ea3d22dc9 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1225,6 +1225,9 @@ set_local_socket (void)
         if (!tmpdir)
           {
 #ifdef DARWIN_OS
+#ifndef _CS_DARWIN_USER_TEMP_DIR
+#define _CS_DARWIN_USER_TEMP_DIR 65537
+#endif
             size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
             if (n > 0)
               {