summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-03-20 14:17:21 +0000
committerJason Rumney <jasonr@gnu.org>2008-03-20 14:17:21 +0000
commite280e5de6447ac1f9687844f3ecec68cbd647f3c (patch)
tree62b7ca04e8fc74b93b26a76ef7c592ba572f04ee
parent33311fb41f6d509fe536935b4a6b306ffc9859e7 (diff)
downloademacs-e280e5de6447ac1f9687844f3ecec68cbd647f3c.tar.gz
(add_registry): Cast return value of alloca.
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/addpm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 9ed90a97eec..497fbec0008 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-20 Juanma Barranquero <lekktu@gmail.com>
+
+ * addpm.c: Include malloc.h.
+ (add_registry): Cast return value of alloca.
+
2008-02-11 Jason Rumney <jasonr@gnu.org>
* addpm.c (add_registry): Add an App Paths registry key.
diff --git a/nt/addpm.c b/nt/addpm.c
index 8541c468b46..52c2d32a959 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -97,7 +97,7 @@ add_registry (path)
HKEY gtk_key = NULL;
len = strlen (path) + 15; /* \bin\emacs.exe + terminator. */
- emacs_path = alloca (len);
+ emacs_path = (char *) alloca (len);
sprintf (emacs_path, "%s\\bin\\emacs.exe", path);
RegSetValueEx (hrootkey, NULL, 0, REG_SZ, emacs_path, len);