mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
(submit/drop-cygwin) drop remains of cygwin support
Cygwin support doesn't seem to be used anymore, so it can be dropped. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
@@ -166,7 +166,7 @@ SOFTWARE.
|
||||
|
||||
#endif /* WIN32 */
|
||||
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
#include <libgen.h>
|
||||
#endif
|
||||
|
||||
@@ -1081,7 +1081,7 @@ ComputeLocalClient(ClientPtr client)
|
||||
*/
|
||||
char *tok = strtok(cmd, ":");
|
||||
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
ret = strcmp(basename(tok), "ssh") != 0;
|
||||
#else
|
||||
ret = strcmp(tok, "ssh") != 0;
|
||||
|
||||
12
os/osinit.c
12
os/osinit.c
@@ -106,7 +106,7 @@ OsRegisterSigWrapper(OsSigWrapperPtr newSigWrapper)
|
||||
* OsSigHandler --
|
||||
* Catch unexpected signals and exit or continue cleanly.
|
||||
*/
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
static void
|
||||
#ifdef SA_SIGINFO
|
||||
OsSigHandler(int signo, siginfo_t * sip, void *unused)
|
||||
@@ -158,7 +158,7 @@ OsSigHandler(int signo)
|
||||
FatalError("Caught signal %d (%s). Server aborting\n",
|
||||
signo, strsignal(signo));
|
||||
}
|
||||
#endif /* !WIN32 || __CYGWIN__ */
|
||||
#endif /* !WIN32 */
|
||||
|
||||
void
|
||||
OsInit(void)
|
||||
@@ -170,7 +170,7 @@ OsInit(void)
|
||||
#endif
|
||||
|
||||
if (!been_here) {
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
struct sigaction act, oact;
|
||||
int i;
|
||||
|
||||
@@ -198,7 +198,7 @@ OsInit(void)
|
||||
siglist[i], strerror(errno));
|
||||
}
|
||||
}
|
||||
#endif /* !WIN32 || __CYGWIN__ */
|
||||
#endif /* !WIN32 */
|
||||
busfault_init();
|
||||
server_poll = ospoll_create();
|
||||
if (!server_poll)
|
||||
@@ -252,7 +252,7 @@ OsInit(void)
|
||||
dup2(fileno(err), 2);
|
||||
fclose(err);
|
||||
}
|
||||
#if defined(SVR4) || defined(WIN32) || defined(__CYGWIN__)
|
||||
#if defined(SVR4) || defined(WIN32)
|
||||
{
|
||||
static char buf[BUFSIZ];
|
||||
|
||||
@@ -264,7 +264,7 @@ OsInit(void)
|
||||
}
|
||||
#endif /* !XQUARTZ */
|
||||
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
if (getpgrp() == 0)
|
||||
setpgid(0, 0);
|
||||
#endif
|
||||
|
||||
22
os/utils.c
22
os/utils.c
@@ -50,17 +50,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
#include <dix-config.h>
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
/*
|
||||
Sigh... We really need a prototype for this to know it is stdcall,
|
||||
but #include-ing <windows.h> here is not a good idea...
|
||||
*/
|
||||
__stdcall unsigned long GetTickCount(void);
|
||||
#endif
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
#if defined(WIN32)
|
||||
#include <X11/Xwinsock.h>
|
||||
#endif
|
||||
#include <X11/Xos.h>
|
||||
@@ -146,7 +136,7 @@ static clockid_t clockid;
|
||||
OsSigHandlerPtr
|
||||
OsSignal(int sig, OsSigHandlerPtr handler)
|
||||
{
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
#if defined(WIN32)
|
||||
return signal(sig, handler);
|
||||
#else
|
||||
struct sigaction act, oact;
|
||||
@@ -204,7 +194,7 @@ ForceClockId(clockid_t forced_clockid)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if (defined WIN32 && defined __MINGW32__) || defined(__CYGWIN__)
|
||||
#if (defined WIN32 && defined __MINGW32__)
|
||||
CARD32
|
||||
GetTimeInMillis(void)
|
||||
{
|
||||
@@ -605,7 +595,7 @@ ProcessCommandLine(int argc, char *argv[])
|
||||
#endif
|
||||
#ifdef LOCK_SERVER
|
||||
else if (strcmp(argv[i], "-nolock") == 0) {
|
||||
#if !defined(WIN32) && !defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
if (getuid() != 0)
|
||||
ErrorF
|
||||
("Warning: the -nolock option can only be used by root\n");
|
||||
@@ -1030,7 +1020,7 @@ OsAbort(void)
|
||||
#ifndef __APPLE__
|
||||
OsBlockSignals();
|
||||
#endif
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
/* abort() raises SIGABRT, so we have to stop handling that to prevent
|
||||
* recursion
|
||||
*/
|
||||
@@ -1517,7 +1507,7 @@ CheckUserAuthorization(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !defined(WIN32) || defined(__CYGWIN__)
|
||||
#if !defined(WIN32)
|
||||
/* Move a file descriptor out of the way of our select mask; this
|
||||
* is useful for file descriptors which will never appear in the
|
||||
* select mask to avoid reducing the number of clients that can
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
#include <assert.h> /* assertion macros */
|
||||
#include <string.h> /* string functions */
|
||||
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
#if defined(WIN32)
|
||||
#include <X11/Xwinsock.h>
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user