merge from trunk

1 files changed, 7 insertions, 0 deletions

diff --git a/src/lisp.h b/src/lisp.h
index 981ab3f6f0b..52110fbbaf4 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4260,10 +4260,17 @@ extern void *xnrealloc (void *, ptrdiff_t, ptrdiff_t);
 extern void *xpalloc (void *, ptrdiff_t *, ptrdiff_t, ptrdiff_t, ptrdiff_t);
 
 extern char *xstrdup (const char *);
+extern char *xlispstrdup (Lisp_Object);
 extern void xputenv (const char *);
 
 extern char *egetenv (const char *);
 
+/* Copy Lisp string to temporary (allocated on stack) C string.  */
+
+#define xlispstrdupa(string)                    \
+  memcpy (alloca (SBYTES (string) + 1),         \
+          SSDATA (string), SBYTES (string) + 1)
+
 /* Set up the name of the machine we're running on.  */
 extern void init_system_name (void);