diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-12 11:27:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-12 11:27:51 +0200 |
| commit | dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 (patch) | |
| tree | bdf833cc6a4fc9035411779e10dd9e8478201885 /xorg-server/os/xstrans.c | |
| parent | 0b40f5f4b54453a77f4b09c431f8efc6875da61f (diff) | |
| download | vcxsrv-dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0.tar.gz vcxsrv-dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0.tar.bz2 vcxsrv-dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0.zip | |
Synchronised line endinge with release branch
Diffstat (limited to 'xorg-server/os/xstrans.c')
| -rw-r--r-- | xorg-server/os/xstrans.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c index cbfdec207..90330c434 100644 --- a/xorg-server/os/xstrans.c +++ b/xorg-server/os/xstrans.c @@ -1,17 +1,17 @@ -#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/Xfuncproto.h>
-
-/* ErrorF is used by xtrans */
-extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
-
-#define TRANS_REOPEN
-#define TRANS_SERVER
-#define XSERV_t
-#ifndef TCPCONN
-#define TCPCONN
-#endif
-
-#include <X11/Xtrans/transport.c>
+#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#include <X11/Xfuncproto.h> + +/* ErrorF is used by xtrans */ +extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); + +#define TRANS_REOPEN +#define TRANS_SERVER +#define XSERV_t +#ifndef TCPCONN +#define TCPCONN +#endif + +#include <X11/Xtrans/transport.c> |