diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
| commit | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (patch) | |
| tree | 38fa447dc8970b83becb4d35487d2bb2e565301b /xorg-server/os/xstrans.c | |
| parent | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (diff) | |
| parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
| download | vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.gz vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.bz2 vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
Conflicts:
xorg-server/Xext/shm.c
xorg-server/os/xstrans.c
Diffstat (limited to 'xorg-server/os/xstrans.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/os/xstrans.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c index cdc8f8eec..30de32b1e 100644..100755 --- a/xorg-server/os/xstrans.c +++ b/xorg-server/os/xstrans.c @@ -5,9 +5,11 @@ #include <X11/Xfuncproto.h> /* ErrorF is used by xtrans */ -/*extern _X_EXPORT void +/*#ifndef HAVE_DIX_CONFIG_H +extern _X_EXPORT void ErrorF(const char *f, ...) -_X_ATTRIBUTE_PRINTF(1, 2);*/ +_X_ATTRIBUTE_PRINTF(1, 2); +#endif*/ #define TRANS_REOPEN #define TRANS_SERVER |