diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-28 11:14:32 +0000 |
| commit | 1840c5631682e0a69ed11487a23a43d45f2d15e1 (patch) | |
| tree | fe954636044c0057b9f08e76d19489493ff09745 /xorg-server/os/xstrans.c | |
| parent | 2ab09dc03e4ecc726ee7b5528306b0fe3e5b1837 (diff) | |
| parent | 57a879849643e79d9674198a3a77c59532fb79b4 (diff) | |
| download | vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.gz vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.bz2 vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/os/xstrans.c')
| -rw-r--r-- | xorg-server/os/xstrans.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c index dd75ab53e..cbfdec207 100644 --- a/xorg-server/os/xstrans.c +++ b/xorg-server/os/xstrans.c @@ -1,12 +1,17 @@ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#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>
|