Commit dc4cb8d5 authored by Eli Zaretskii's avatar Eli Zaretskii

Merge from trunk.

parents 803ee343 98f3b8c6
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.
......
......@@ -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
......
......@@ -551,7 +551,6 @@ extern void _DebPrint (const char *fmt, ...);
#pragma warning(disable:4308)
#endif
#endif
#define TERM_HEADER "w32term.h"
/* ============================================================ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment