procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source
This commit is contained in:
Eli Zaretskii 2013-03-30 10:24:44 +03:00
commit dc4cb8d518
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nt/ChangeLog
View file

@ -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.

2
nt/config.nt
View file

@ -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

1
nt/inc/ms-w32.h
View file

@ -551,7 +551,6 @@ extern void _DebPrint (const char *fmt, ...);
#pragma warning(disable:4308)
#endif
#endif
#define TERM_HEADER "w32term.h"
/* ============================================================ */