diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
| commit | 934184bfecd402aae891b8740d788b486aa7269f (patch) | |
| tree | c23fb0afd169dc6846ea23bda21260fcffd1e3e6 /libXmu/src/StrToCurs.c | |
| parent | 57dd848fb6dd7cf15820172e2abc9fb9de2b4268 (diff) | |
| parent | 4ba9be2882d9f1567809edb0a31fcdf11320d41f (diff) | |
| download | vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.gz vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.bz2 vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/dlopen.h
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/randr/rrxinerama.c
Diffstat (limited to 'libXmu/src/StrToCurs.c')
| -rw-r--r-- | libXmu/src/StrToCurs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXmu/src/StrToCurs.c b/libXmu/src/StrToCurs.c index 17695ed1f..ca4460583 100644 --- a/libXmu/src/StrToCurs.c +++ b/libXmu/src/StrToCurs.c @@ -59,8 +59,8 @@ SOFTWARE. #include <X11/Xmu/CharSet.h> #include <unistd.h> -#ifndef X_NOT_POSIX #include <stdlib.h> + #ifdef _POSIX_SOURCE #include <limits.h> #else @@ -68,7 +68,7 @@ SOFTWARE. #include <limits.h> #undef _POSIX_SOURCE #endif -#endif /* X_NOT_POSIX */ + #ifndef PATH_MAX #ifdef WIN32 #define PATH_MAX 512 |