XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "os: unexport Os*() functions"

Browse Source 
OsBlockSignals & OsReleaseSignals are required by libint10.so

This reverts commit be4c8444eb.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2049>
This commit is contained in:
Alan Coopersmith
2025-07-20 12:14:21 -07:00
parent 5568b0f83f
commit bf867b4658
26 changed files with 42 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
os/connection.c
View File

@@ -91,7 +91,9 @@ SOFTWARE.
#include <netinet/tcp.h>
#include <arpa/inet.h>
#endif
#include <sys/uio.h>
#endif /* WIN32 */
#include "dix/dix_priv.h"

3
os/log.c
View File

@@ -79,6 +79,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#include <X11/Xos.h>
#include <errno.h>
#include <stdio.h>
#include <stdarg.h>
@@ -86,7 +87,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/stat.h>
#include <time.h>
#include <X11/Xfuncproto.h>
#include <X11/Xos.h>
#include "dix/dix_priv.h"
#include "dix/input_priv.h"
@@ -96,6 +96,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include "os/osdep.h"
#include "opaque.h"
#include "osdep.h"
#ifdef XF86BIGFONT
#include "xf86bigfontsrv.h"

13
os/osdep.h
View File

@@ -178,19 +178,6 @@ int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
extern void (*OsVendorVErrorFProc) (const char *, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0);
typedef void (*OsSigHandlerPtr) (int sig);
/* install signal handler */
OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler);
void OsInit(void);
void OsCleanup(Bool);
void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
void OsVendorInit(void);
void OsBlockSignals(void);
void OsReleaseSignals(void);
void OsResetSignals(void);
void OsAbort(void) _X_NORETURN;
void AbortServer(void) _X_NORETURN;
void MakeClientGrabPervious(ClientPtr client);

10
os/osinit.c
View File

@@ -46,11 +46,14 @@ SOFTWARE.
#include <dix-config.h>
#include <errno.h>
#include <stdio.h>
#include <signal.h>
#include <X11/X.h>
#include "os.h"
#include "osdep.h"
#include "opaque.h"
#include <X11/Xos.h>
#include <signal.h>
#include <errno.h>
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#endif
@@ -60,12 +63,9 @@ SOFTWARE.
#include "dix/dix_priv.h"
#include "os/busfault.h"
#include "os/osdep.h"
#include "os/serverlock.h"
#include "misc.h"
#include "os.h"
#include "opaque.h"
#include "dixstruct.h"
#include "dixstruct_priv.h"

1
os/utils.c
View File

@@ -109,7 +109,6 @@ __stdcall unsigned long GetTickCount(void);
#include "os/auth.h"
#include "os/cmdline.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "os/serverlock.h"
#include "dixstruct.h"