aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32select.c
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-17 20:51:06 +0200
committerEli Zaretskii2012-11-17 20:51:06 +0200
commitd8715cdf90538fa8abd3e2c23ed2efd23c4253c1 (patch)
tree746f15349cb6e83ba4d8082770a2d73f93d63b36 /src/w32select.c
parent7436fc63c0c24eb7fee800176c387db87f51de50 (diff)
downloademacs-d8715cdf90538fa8abd3e2c23ed2efd23c4253c1.tar.gz
emacs-d8715cdf90538fa8abd3e2c23ed2efd23c4253c1.zip
Fix bug #12878 with compilation failure with Visual C++ 11.0.
src/w32select.c: Include w32common.h before w32term.h, so that windows.h gets included before w32term.h uses some of its features, see below. src/w32term.h (LOCALE_ENUMPROCA, LOCALE_ENUMPROCW) [_MSC_VER]: New typedefs. (EnumSystemLocalesA, EnumSystemLocalesW) [_MSC_VER]: New prototypes. (EnumSystemLocales) [_MSC_VER]: Define if undefined.
Diffstat (limited to 'src/w32select.c')
-rw-r--r--src/w32select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32select.c b/src/w32select.c
index 1b10c74cfe9..6a2a840f914 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -74,8 +74,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
74 74
75#include <config.h> 75#include <config.h>
76#include "lisp.h" 76#include "lisp.h"
77#include "w32term.h" /* for all of the w32 includes */
78#include "w32common.h" /* os_subtype */ 77#include "w32common.h" /* os_subtype */
78#include "w32term.h" /* for all of the w32 includes */
79#include "keyboard.h" 79#include "keyboard.h"
80#include "blockinput.h" 80#include "blockinput.h"
81#include "charset.h" 81#include "charset.h"