diff options
| author | marha <marha@users.sourceforge.net> | 2015-02-22 21:39:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-02-22 21:39:56 +0100 |
| commit | 462f18c7b25fe3e467f837647d07ab0a78aa8d2b (patch) | |
| tree | fc8013c0a1bac05a1945846c1697e973f4c35013 /xorg-server/os/connection.c | |
| parent | 36f711ee12b6dd5184198abed3aa551efb585587 (diff) | |
| download | vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.gz vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.bz2 vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.zip | |
Merged origin/release (checked in because wanted to merge new stuff)
Diffstat (limited to 'xorg-server/os/connection.c')
| -rwxr-xr-x | xorg-server/os/connection.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index 2d9d74b66..6ebfa453b 100755 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -120,17 +120,11 @@ typedef int pid_t; #ifdef HAVE_GETPEERUCRED #include <ucred.h> #include <zone.h> -#endif - -#ifdef XSERVER_DTRACE -#include <sys/types.h> -typedef const char *string; - -#ifndef HAVE_GETPEERUCRED +#else #define zoneid_t int #endif -#include "../dix/Xserver-dtrace.h" -#endif + +#include "probes.h" static int lastfdesc; /* maximum file descriptor */ |