Commit b3317662 authored by Fabrice Popineau's avatar Fabrice Popineau Committed by Eli Zaretskii

Fix minor compilation problem with MSVC.

 src/emacs.c: Move the inclusion of TERM_HEADER after including
 windows.h on WINDOWSNT.  This avoids compilation problems with
 MSVC.
parent 3d3bfa24
2012-10-01 Fabrice Popineau <fabrice.popineau@gmail.com>
* emacs.c: Move the inclusion of TERM_HEADER after including
windows.h on WINDOWSNT. This avoids compilation problems with
MSVC.
2012-10-01 Eli Zaretskii <eliz@gnu.org>
* unexw32.c (OFFSET_TO_RVA, RVA_TO_OFFSET)
......
......@@ -31,10 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "lisp.h"
#ifdef HAVE_WINDOW_SYSTEM
#include TERM_HEADER
#endif /* HAVE_WINDOW_SYSTEM */
#ifdef WINDOWSNT
#include <fcntl.h>
#include <windows.h> /* just for w32.h */
......@@ -42,6 +38,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "w32heap.h" /* for prototype of sbrk */
#endif
#ifdef HAVE_WINDOW_SYSTEM
#include TERM_HEADER
#endif /* HAVE_WINDOW_SYSTEM */
#ifdef NS_IMPL_GNUSTEP
/* At least under Debian, GSConfig is in a subdirectory. --Stef */
#include <GNUstepBase/GSConfig.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