aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2007-09-04 22:41:07 +0000
committerJason Rumney2007-09-04 22:41:07 +0000
commita492666863021b7c65125785cec9167d260a417f (patch)
treec67fa00682109df1d9351dff7bf2112e2c0737ed /src
parent953bf0dce8618108b663edfd820bba5e8a07ce24 (diff)
downloademacs-a492666863021b7c65125785cec9167d260a417f.tar.gz
emacs-a492666863021b7c65125785cec9167d260a417f.zip
(MULTI_KBOARD): Define.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/s/ms-w32.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9345aa548bd..0a5885d516c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12007-09-04 Jason Rumney <jasonr@gnu.org> 12007-09-04 Jason Rumney <jasonr@gnu.org>
2 2
3 * s/ms-w32.h (MULTI_KBOARD): Define.
4
3 * w32console.c (one_and_only_w32cons): Remove. 5 * w32console.c (one_and_only_w32cons): Remove.
4 (initialize_w32_display): Take terminal argument. 6 (initialize_w32_display): Take terminal argument.
5 7
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index e4f5cc119e0..5a297a4ee80 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -302,6 +302,8 @@ Boston, MA 02110-1301, USA. */
302#define HAVE_MOUSE 1 302#define HAVE_MOUSE 1
303#define HAVE_H_ERRNO 1 303#define HAVE_H_ERRNO 1
304 304
305#define MULTI_KBOARD 1
306
305#ifdef HAVE_NTGUI 307#ifdef HAVE_NTGUI
306#define HAVE_WINDOW_SYSTEM 1 308#define HAVE_WINDOW_SYSTEM 1
307#define HAVE_FACES 1 309#define HAVE_FACES 1