From c467e0fef2b3134566694823d72464bf51dd207c Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 3 Mar 2002 03:15:10 +0000 Subject: [PATCH] added padding. Sun Mar 3 02:30:05 2002 Tim Janik * glib/gscanner.h (_GScannerConfig): added padding. * glib/ghook.h (struct _GHook): add two padding pointers. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/reference/glib/tmpl/hooks.sgml | 1 + docs/reference/glib/tmpl/scanner.sgml | 1 + glib/ghook.c | 2 ++ glib/ghook.h | 1 + glib/gscanner.h | 1 + 13 files changed, 54 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * glib/gshell.c (g_shell_unquote): Fix memory leak. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5d815c7d..3e4eb04b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Mar 3 02:30:05 2002 Tim Janik + + * glib/gscanner.h (_GScannerConfig): added padding. + + * glib/ghook.h (struct _GHook): add two padding pointers. + Thu Feb 28 11:13:49 2002 Owen Taylor * 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 bf876631..f46e91e6 100644 --- 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 destroy function. +@dummy: diff --git a/docs/reference/glib/tmpl/scanner.sgml b/docs/reference/glib/tmpl/scanner.sgml index b49baf6f..f936b2e3 100644 --- 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: diff --git a/glib/ghook.c b/glib/ghook.c index d04162fa..d2b0fcdb 100644 --- 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 e6bfb461..1eb52e02 100644 --- 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 2d2062b9..f6b471d1 100644 --- 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 -- 2.34.1