XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

include: misc.h: drop duplicate definition of CallbackListPtr

Browse Source 
This type is already defined in `include/callback.h` - anybody who wants it
most likely needs that include file, too.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-23 12:03:07 +02:00
committed by Enrico Weigelt
parent 41d2eae91f
commit 678b025df5
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Xext/xace.h
View File

@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_MINOR_VERSION 0 #define XACE_MINOR_VERSION 0
#include "dix/selection_priv.h" #include "dix/selection_priv.h"
#include "include/callback.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "pixmap.h" #include "pixmap.h"

6
include/callback.h
View File

@@ -56,11 +56,7 @@ SOFTWARE.
* callback manager stuff * callback manager stuff
*/ */
#ifndef _XTYPEDEF_CALLBACKLISTPTR typedef struct _CallbackList *CallbackListPtr;
typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
#define _XTYPEDEF_CALLBACKLISTPTR
#endif
typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *); typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);

5
include/dixstruct.h
View File

@@ -24,6 +24,10 @@ SOFTWARE.
#ifndef DIXSTRUCT_H #ifndef DIXSTRUCT_H
#define DIXSTRUCT_H #define DIXSTRUCT_H
#include <X11/Xmd.h>
#include "callback.h"
#include "client.h" #include "client.h"
#include "dix.h" #include "dix.h"
#include "resource.h" #include "resource.h"
@@ -31,7 +35,6 @@ SOFTWARE.
#include "gc.h" #include "gc.h"
#include "pixmap.h" #include "pixmap.h"
#include "privates.h" #include "privates.h"
#include <X11/Xmd.h>
/* /*
* direct-mapped hash table, used by resource manager to store * direct-mapped hash table, used by resource manager to store

6
include/misc.h
View File

@@ -115,12 +115,6 @@ typedef int XRetCode;
#define FALSE 0 #define FALSE 0
#endif #endif
#ifndef _XTYPEDEF_CALLBACKLISTPTR
typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
#define _XTYPEDEF_CALLBACKLISTPTR
#endif
typedef struct _xReq *xReqPtr; typedef struct _xReq *xReqPtr;
#include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ #include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */

2
include/os.h
View File

@@ -47,7 +47,9 @@ SOFTWARE.
#ifndef OS_H #ifndef OS_H
#define OS_H #define OS_H
#include "callback.h"
#include "misc.h" #include "misc.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>