diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-29 12:24:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-30 13:04:44 -0700 |
| commit | 998e982b775073da59412dce8ce609ea2ad7967c (patch) | |
| tree | 9a33b4883bc0612dc8cf29f4be84a2f1e9fb703d /include/dix.h | |
| parent | 7dde50c649089b03650d6497079a690feea65e22 (diff) | |
Move callback definitions to their own file
Needed as the privates stuff uses the callbacks before they would have
been defined in dix.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Diffstat (limited to 'include/dix.h')
| -rw-r--r-- | include/dix.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/include/dix.h b/include/dix.h index 6505fd02f..dc86257fb 100644 --- a/include/dix.h +++ b/include/dix.h @@ -48,6 +48,7 @@ SOFTWARE. #ifndef DIX_H #define DIX_H +#include "callback.h" #include "gc.h" #include "window.h" #include "input.h" @@ -512,36 +513,6 @@ ScreenRestructured (ScreenPtr pScreen); extern _X_EXPORT int ffs(int i); -/* - * callback manager stuff - */ - -#ifndef _XTYPEDEF_CALLBACKLISTPTR -typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */ -#define _XTYPEDEF_CALLBACKLISTPTR -#endif - -typedef void (*CallbackProcPtr) ( - CallbackListPtr *, pointer, pointer); - -extern _X_EXPORT Bool AddCallback( - CallbackListPtr * /*pcbl*/, - CallbackProcPtr /*callback*/, - pointer /*data*/); - -extern _X_EXPORT Bool DeleteCallback( - CallbackListPtr * /*pcbl*/, - CallbackProcPtr /*callback*/, - pointer /*data*/); - -extern _X_EXPORT void CallCallbacks( - CallbackListPtr * /*pcbl*/, - pointer /*call_data*/); - -extern _X_EXPORT void DeleteCallbackList( - CallbackListPtr * /*pcbl*/); - -extern _X_EXPORT void InitCallbackManager(void); /* * ServerGrabCallback stuff |