diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-05 09:43:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-05 09:43:03 +0000 |
| commit | 0874ae23a16946781dd517cfdb011c691ad0b581 (patch) | |
| tree | 8de31864935e96a5e59b9fe6ceb12390bbc474cd /xorg-server/include/dix.h | |
| parent | d059ebdcb012228102f0b64f8cddf9464d5b625a (diff) | |
| download | vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.tar.gz vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.tar.bz2 vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.zip | |
svn merge -r571:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/include/dix.h')
| -rw-r--r-- | xorg-server/include/dix.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index 6505fd02f..dc86257fb 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/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 |