Move MS-Windows definition of TERM_HEADER from ms-w32.h to config.nt.

 nt/inc/ms-w32.h (TERM_HEADER): Remove definition.
 nt/config.nt (TERM_HEADER): Move the definition to "w32term.h" from
 ms-w32.h.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 59e8ec5b95a3fc827c3bf8f093d5aee584a9584f..53dfdbe33cae297e60f39ec76cebe73824d66c33 100644 (file)
--- 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 a7e2dce3e063726593c647fc873bf341f05d3c0c..347a1b07dd419acc0c7fa503abfaae252a4c4c07 100644 (file)
--- 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 7b9dbc2430bfd719bb031840860a4aa9e7164b21..c67f07b99b3707092a006474631403d91646d3c1 100644 (file)
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -537,7 +537,6 @@ extern void _DebPrint (const char *fmt, ...);
 #pragma warning(disable:4308)
 #endif
 #endif
-#define TERM_HEADER "w32term.h"
 
 
 /* ============================================================ */