diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
| commit | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (patch) | |
| tree | ad86feed38d780515cf9da608c5ea21eed04e17d /libX11/src/xlibi18n | |
| parent | 4f67039e9191d5251c39069bd791a05c5cf22022 (diff) | |
| parent | 873965b49f283ad028dd4e0e5b7e93a758c84993 (diff) | |
| download | vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.gz vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.bz2 vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXmu/src/CmapAlloc.c
Diffstat (limited to 'libX11/src/xlibi18n')
| -rw-r--r-- | libX11/src/xlibi18n/lcFile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/src/xlibi18n/lcFile.c b/libX11/src/xlibi18n/lcFile.c index c7f13ffe8..576a61124 100644 --- a/libX11/src/xlibi18n/lcFile.c +++ b/libX11/src/xlibi18n/lcFile.c @@ -36,7 +36,7 @@ /************************************************************************/ -#ifdef __UNIXOS2__ +#ifndef HAVE_SETEUID # define seteuid setuid #endif #define iscomment(ch) ((ch) == '#' || (ch) == '\0') |