added padding.

Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>

        * glib/gscanner.h (_GScannerConfig): added padding.

        * glib/ghook.h (struct _GHook): add two padding pointers.

diff --git a/ChangeLog b/ChangeLog
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5d815c7..3e4eb04 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Mar  3 02:30:05 2002  Tim Janik  <timj@gtk.org>
+
+       * glib/gscanner.h (_GScannerConfig): added padding.
+
+       * glib/ghook.h (struct _GHook): add two padding pointers.
+
 Thu Feb 28 11:13:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gshell.c (g_shell_unquote): Fix memory leak.

diff --git a/docs/reference/glib/tmpl/hooks.sgml b/docs/reference/glib/tmpl/hooks.sgml
index bf87663..f46e91e 100644 (file)
--- a/docs/reference/glib/tmpl/hooks.sgml
+++ b/docs/reference/glib/tmpl/hooks.sgml
@@ -30,6 +30,7 @@ list of hook functions.
 @hook_memchunk: the #GMemChunk used for allocating the #GHook elements.
 @finalize_hook: the function to call to finalize a #GHook element. The
 default behaviour is to call the hooks <function>destroy</function> function.
+@dummy: 
 
 <!-- ##### USER_FUNCTION GHookFinalizeFunc ##### -->
 <para>

diff --git a/docs/reference/glib/tmpl/scanner.sgml b/docs/reference/glib/tmpl/scanner.sgml
index b49baf6..f936b2e 100644 (file)
--- a/docs/reference/glib/tmpl/scanner.sgml
+++ b/docs/reference/glib/tmpl/scanner.sgml
@@ -214,6 +214,7 @@ is searched for in the default scope in addition to the current scope
 @char_2_token: 
 @symbol_2_token: 
 @scope_0_fallback: 
+@padding_dummy: 
 
 <!-- ##### FUNCTION g_scanner_input_file ##### -->
 <para>

diff --git a/glib/ghook.c b/glib/ghook.c
index d04162f..d2b0fcd 100644 (file)
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -69,6 +69,8 @@ g_hook_list_init (GHookList *hook_list,
                                              hook_size * G_HOOKS_PREALLOC,
                                              G_ALLOC_AND_FREE);
   hook_list->finalize_hook = default_finalize_hook;
+  hook_list->dummy[0] = NULL;
+  hook_list->dummy[1] = NULL;
 }
 
 void

diff --git a/glib/ghook.h b/glib/ghook.h
index e6bfb46..1eb52e0 100644 (file)
--- a/glib/ghook.h
+++ b/glib/ghook.h
@@ -66,6 +66,7 @@ struct _GHookList
   GHook                   *hooks;
   GMemChunk       *hook_memchunk;
   GHookFinalizeFunc finalize_hook;
+  gpointer         dummy[2];
 };
 struct _GHook
 {

diff --git a/glib/gscanner.h b/glib/gscanner.h
index 2d2062b..f6b471d 100644 (file)
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -154,6 +154,7 @@ struct      _GScannerConfig
   guint                char_2_token : 1;               /* return G_TOKEN_CHAR? */
   guint                symbol_2_token : 1;
   guint                scope_0_fallback : 1;           /* try scope 0 on lookups? */
+  guint                padding_dummy;
 };
 
 struct _GScanner