From 26526ea581832a2839ff7cf8d6ba6a88bdadb974 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 Aug 2004 04:53:23 +0000 Subject: [PATCH] Link with -limm32. 2004-08-30 Tor Lillqvist * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32. * modules/input/gtkimcontextime.c: Use quotes in #includes, to find headers when building inside GTK+ sources. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ modules/input/Makefile.am | 2 +- modules/input/gtkimcontextime.c | 6 +++--- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fa429e95..565868d41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-08-30 Tor Lillqvist + + * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32. + + * modules/input/gtkimcontextime.c: Use quotes in #includes, to + find headers when building inside GTK+ sources. + 2004-08-27 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2fa429e95..565868d41 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-08-30 Tor Lillqvist + + * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32. + + * modules/input/gtkimcontextime.c: Use quotes in #includes, to + find headers when building inside GTK+ sources. + 2004-08-27 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2fa429e95..565868d41 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-08-30 Tor Lillqvist + + * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32. + + * modules/input/gtkimcontextime.c: Use quotes in #includes, to + find headers when building inside GTK+ sources. + 2004-08-27 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2fa429e95..565868d41 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-08-30 Tor Lillqvist + + * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32. + + * modules/input/gtkimcontextime.c: Use quotes in #includes, to + find headers when building inside GTK+ sources. + 2004-08-27 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index b234f0b2e..42c6e8997 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -82,7 +82,7 @@ im_ime_la_SOURCES = \ gtkimcontextime.h \ imime.c \ imm-extra.h -im_ime_la_LIBADD = $(LDADDS) +im_ime_la_LIBADD = -limm32 $(LDADDS) if PLATFORM_WIN32 IM_IME_MODULE=im-ime.la endif diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c index b441d53c5..82397bbb9 100644 --- a/modules/input/gtkimcontextime.c +++ b/modules/input/gtkimcontextime.c @@ -30,9 +30,9 @@ #include "imm-extra.h" -#include -#include -#include +#include "gdk/win32/gdkwin32.h" +#include "gdk/gdkkeysyms.h" +#include "gtk/gtkwidget.h" /* avoid warning */ #ifdef STRICT -- 2.43.2