diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-30 14:10:41 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-30 14:10:41 +0300 |
| commit | 8934438ad1d95a47ed772fae3261d64805c47289 (patch) | |
| tree | cdd65c64873ac89ee3fd7aa6836a248f8fdf7419 /nt/inc | |
| parent | 6cd0eaeb6b39905e620f7b248665243b12f2f335 (diff) | |
| download | emacs-8934438ad1d95a47ed772fae3261d64805c47289.tar.gz | |
Fixed redefinition of EMACS_CONFIGURATION.
Diffstat (limited to 'nt/inc')
| -rw-r--r-- | nt/inc/ms-w32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 5c1880b8f28..39820bf2f08 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -399,10 +399,12 @@ extern int sys_kill (int, int); #define getdefdir(_drv, _buf) _getdcwd (_drv, _buf, MAXPATHLEN) #endif +#ifndef EMACS_CONFIGURATION extern char *get_emacs_configuration (void); extern char *get_emacs_configuration_options (void); #define EMACS_CONFIGURATION get_emacs_configuration () #define EMACS_CONFIG_OPTIONS get_emacs_configuration_options () +#endif /* Define this so that winsock.h definitions don't get included with windows.h. For this to have proper effect, config.h must always be |