Merge from trunk.

3 files changed, 8 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 59e8ec5b95a..53dfdbe33ca 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/ms-w32.h (TERM_HEADER): Remove definition.
+
+        * config.nt (TERM_HEADER): Move the definition to "w32term.h" from
+        ms-w32.h.
+
 2013-03-29  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/ms-w32.h (copysign) [_MSC_VER]: Redirect to _copysign.
diff --git a/nt/config.nt b/nt/config.nt
index a7e2dce3e06..347a1b07dd4 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1370,7 +1370,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef TERMINFO
 
 /* Define to the header for the built-in window system. */
-#undef TERM_HEADER
+#define TERM_HEADER "w32term.h"
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index a6a16111ddd..5c1880b8f28 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -551,7 +551,6 @@ extern void _DebPrint (const char *fmt, ...);
 #pragma warning(disable:4308)
 #endif
 #endif
-#define TERM_HEADER "w32term.h"
 
 
 /* ============================================================ */