luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-05 13:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed the #pragma } statement after extern "C" {. use (c-set-offset

Browse Source 
Wed Oct  7 05:31:24 1998  Tim Janik  <timj@gtk.org>

        * glib.h:
        removed the #pragma } statement after extern "C" {. use
        (c-set-offset 'inextern-lang 0) to fixup emacs cc-mode indentation.

        * glib.h:
        * ghook.c: API and code cleanups. changed the G_HOOK_ACTIVE and
        G_HOOK_IN_CALL enum vals to G_HOOK_FLAG_ACTIVE and G_HOOK_FLAG_IN_CALL.
        changed the G_HOOK_IS_ACTIVE() and G_HOOK_IS_IN_CALL() macros to
        G_HOOK_ACTIVE() and G_HOOK_IN_CALL().
        fixed the g_hook_find* functions, so they iterate over non-active
        hooks as well.
        (g_hook_first_valid):
        (g_hook_next_valid): added an extra argument gboolean may_be_in_call,
        which indicates whether G_HOOK_IN_CALL() hooks are considered valid
        or not. these two functions are meant as iterators for the hook list
        invocation, so they need to a) provide functionality to implement
        may_recurse bahaviour and b) only walk active hooks.
This commit is contained in:
Tim Janik
1998-10-07 04:19:14 +00:00
committed by Tim Janik
parent 823a25beb6
commit 43cc1dbf96
12 changed files with 350 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
glib/glib.h
View File

@@ -85,14 +85,8 @@
#endif /* HAVE_VALUES_H */
/* the #pragma } statment is used to fix up emacs' c-mode which gets
* confused by extern "C" {. the ansi standard says that compilers
* have to ignore #pragma directives that they don't know about,
* so we should be save in using this.
*/
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus */
@@ -1010,8 +1004,8 @@ GNode* g_node_last_sibling (GNode *node);
#define G_HOOK_FLAG_USER_SHIFT (4)
typedef enum
{
G_HOOK_ACTIVE = 1 << 0,
G_HOOK_IN_CALL = 1 << 1,
G_HOOK_FLAG_ACTIVE = 1 << 0,
G_HOOK_FLAG_IN_CALL = 1 << 1,
G_HOOK_FLAG_MASK = 0x0f
} GHookFlagMask;
@@ -1036,12 +1030,12 @@ struct _GHook
GDestroyNotify destroy;
};
#define G_HOOK_IS_ACTIVE(hook) ((((GHook*) hook)->flags & \
G_HOOK_ACTIVE) != 0)
#define G_HOOK_IS_IN_CALL(hook) ((((GHook*) hook)->flags & \
G_HOOK_IN_CALL) != 0)
#define G_HOOK_ACTIVE(hook) ((((GHook*) hook)->flags & \
G_HOOK_FLAG_ACTIVE) != 0)
#define G_HOOK_IN_CALL(hook) ((((GHook*) hook)->flags & \
G_HOOK_FLAG_IN_CALL) != 0)
#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \
G_HOOK_IS_ACTIVE (hook))
G_HOOK_ACTIVE (hook))
#define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \
((GHook*) hook)->prev == NULL && \
((GHook*) hook)->hook_id == 0 && \
@@ -1085,8 +1079,12 @@ GHook* g_hook_find_func_data (GHookList *hook_list,
gboolean need_valids,
gpointer func,
gpointer data);
GHook* g_hook_first_valid (GHookList *hook_list);
GHook* g_hook_next_valid (GHook *hook);
GHook* g_hook_first_valid (GHookList *hook_list,
gboolean may_be_in_call);
GHook* g_hook_next_valid (GHook *hook,
gboolean may_be_in_call);
/* GHookCompareFunc implementation to insert hooks sorted by their id */
gint g_hook_compare_ids (GHook *new_hook,
GHook *sibling);