From 2f31e7ed12099c8a6c54255867e9fc9dbb88dd89 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 24 Aug 2002 23:06:16 +0000 Subject: [PATCH] Include gtkbox.h and gtkwindow.h on Win32, as the defines for struct 2002-08-25 Tor Lillqvist * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the defines for struct packing checks use sizeof() on stuff from these. (#84211, Andreas Holzmann) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkmain.h | 5 ++++- 7 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2536e08bb3..a74da01a23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-08-25 Tor Lillqvist + * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the + defines for struct packing checks use sizeof() on stuff from + these. (#84211, Andreas Holzmann) + * gtk/Makefile.am (libgtk_win32_2_0_la_DEPENDENCIES): Add gtk_win32res_lo. (#87101, J. Ali Harlow) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2536e08bb3..a74da01a23 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2002-08-25 Tor Lillqvist + * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the + defines for struct packing checks use sizeof() on stuff from + these. (#84211, Andreas Holzmann) + * gtk/Makefile.am (libgtk_win32_2_0_la_DEPENDENCIES): Add gtk_win32res_lo. (#87101, J. Ali Harlow) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2536e08bb3..a74da01a23 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,9 @@ 2002-08-25 Tor Lillqvist + * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the + defines for struct packing checks use sizeof() on stuff from + these. (#84211, Andreas Holzmann) + * gtk/Makefile.am (libgtk_win32_2_0_la_DEPENDENCIES): Add gtk_win32res_lo. (#87101, J. Ali Harlow) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2536e08bb3..a74da01a23 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2002-08-25 Tor Lillqvist + * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the + defines for struct packing checks use sizeof() on stuff from + these. (#84211, Andreas Holzmann) + * gtk/Makefile.am (libgtk_win32_2_0_la_DEPENDENCIES): Add gtk_win32res_lo. (#87101, J. Ali Harlow) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2536e08bb3..a74da01a23 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2002-08-25 Tor Lillqvist + * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the + defines for struct packing checks use sizeof() on stuff from + these. (#84211, Andreas Holzmann) + * gtk/Makefile.am (libgtk_win32_2_0_la_DEPENDENCIES): Add gtk_win32res_lo. (#87101, J. Ali Harlow) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2536e08bb3..a74da01a23 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2002-08-25 Tor Lillqvist + * gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the + defines for struct packing checks use sizeof() on stuff from + these. (#84211, Andreas Holzmann) + * gtk/Makefile.am (libgtk_win32_2_0_la_DEPENDENCIES): Add gtk_win32res_lo. (#87101, J. Ali Harlow) diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index 7837bfc29c..a89481bd14 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -30,7 +30,10 @@ #include #include - +#ifdef G_PLATFORM_WIN32 +#include +#include +#endif #ifdef __cplusplus extern "C" {