fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 07:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "dix: unexport MakePredeclaredAtoms()"

Browse source 
This reverts commit b3ec0bf58a.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2048>
This commit is contained in:
Alan Coopersmith 2025-07-16 17:14:21 -07:00
parent 122345d484
commit e923310d2f
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dix/atom.c
View file

@ -46,13 +46,10 @@ SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#include <stdio.h>
#include <string.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <stdio.h>
#include "dix/dix_priv.h" #include <string.h>
#include "misc.h" #include "misc.h"
#include "resource.h" #include "resource.h"
#include "dix.h" #include "dix.h"

3
dix/dix_priv.h
View file

@ -252,7 +252,4 @@ extern Bool explicit_display;
extern Bool disableBackingStore; extern Bool disableBackingStore;
extern Bool enableBackingStore; extern Bool enableBackingStore;
/* in generated BuiltInAtoms.c */
void MakePredeclaredAtoms(void);
#endif /* _XSERVER_DIX_PRIV_H */ #endif /* _XSERVER_DIX_PRIV_H */

3
dix/generate-atoms
View file

@ -25,9 +25,6 @@ cat > "$OUTPUT" << __END__
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "dix/dix_priv.h"
#include "misc.h" #include "misc.h"
#include "dix.h" #include "dix.h"
void void

2
include/misc.h
View file

@ -354,6 +354,8 @@ extern _X_EXPORT void SwapLongs(CARD32 *list, unsigned long count);
extern _X_EXPORT void SwapShorts(short *list, unsigned long count); extern _X_EXPORT void SwapShorts(short *list, unsigned long count);
extern _X_EXPORT void MakePredeclaredAtoms(void);
typedef struct _xPoint *DDXPointPtr; typedef struct _xPoint *DDXPointPtr;
typedef struct pixman_box16 *BoxPtr; typedef struct pixman_box16 *BoxPtr;
typedef struct _xEvent *xEventPtr; typedef struct _xEvent *xEventPtr;