diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/emacs.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 074c74a70e2..fd523dd0f1e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +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) diff --git a/src/emacs.c b/src/emacs.c index f3f2081e2e9..a603a56b792 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -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> |