From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 Mar 2013 11:10:41 +0000 (+0300)
Subject: Fixed redefinition of EMACS_CONFIGURATION.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8934438ad1d95a47ed772fae3261d64805c47289;p=emacs.git

Fixed redefinition of EMACS_CONFIGURATION.
---

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