[Emacs-diffs] /srv/bzr/emacs/trunk r110324: Fix minor compilation problem with MSVC.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110324
author: Fabrice Popineau <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-01 16:25:40 +0200
message:
  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.
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-01 11:37:37 +0000
+++ b/src/ChangeLog     2012-10-01 14:25:40 +0000
@@ -1,3 +1,9 @@
+2012-10-01  Fabrice Popineau  <address@hidden>
+
+       * 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  <address@hidden>
 
        * unexw32.c (OFFSET_TO_RVA, RVA_TO_OFFSET)

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2012-10-01 09:29:14 +0000
+++ b/src/emacs.c       2012-10-01 14:25:40 +0000
@@ -31,10 +31,6 @@
 
 #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 @@
 #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>