diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-02-25 11:28:07 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-02-25 11:28:07 +0000 |
| commit | c44b4b4643c032353b9188282e2204746e4be68f (patch) | |
| tree | 24035041213505325c79970107c983134a8667f9 /nt | |
| parent | 38cd9f1734136fd33fc5bb050fe8085377850c4d (diff) | |
| download | emacs-c44b4b4643c032353b9188282e2204746e4be68f.tar.gz | |
Include malloc.h.
(add_registry): Cast return value of alloca.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/addpm.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 3a4e09ff528..5d114383a8b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2008-02-25 Juanma Barranquero <lekktu@gmail.com> + + * addpm.c: Include malloc.h. + (add_registry): Cast return value of alloca. + 2008-02-24 Dan Nicolaescu <dann@ics.uci.edu> * config.nt (SHORTNAMES): Remove reference to obsolete variable. diff --git a/nt/addpm.c b/nt/addpm.c index 297fc4c5e81..b05494a4678 100644 --- a/nt/addpm.c +++ b/nt/addpm.c @@ -32,6 +32,7 @@ Boston, MA 02110-1301, USA. */ #include <ddeml.h> #include <stdlib.h> #include <stdio.h> +#include <malloc.h> HDDEDATA CALLBACK DdeCallback (UINT uType, UINT uFmt, HCONV hconv, @@ -87,7 +88,7 @@ add_registry (path) affect the general operation of other installations of Emacs, and we are blindly overwriting the Start Menu entries already. */ - if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, REG_APP_PATH, 0, "", + if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, REG_APP_PATH, 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrootkey, NULL) == ERROR_SUCCESS) { @@ -96,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); |