diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
| commit | acd000667561cb9978ead7f14d4fbb97c1a8e727 (patch) | |
| tree | 21668e5efeb08af34de6c679d4c46cc6fe5d7b64 /xorg-server/include/os.h | |
| parent | 893624a6c15d4ee6cf1d46e4ad29282c72bee962 (diff) | |
| parent | 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (diff) | |
| download | vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.gz vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.bz2 vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/include/os.h')
| -rw-r--r-- | xorg-server/include/os.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 78ece7101..67493645d 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -474,22 +474,22 @@ extern _X_EXPORT void ddxGiveUp(enum ExitCode error); extern _X_EXPORT int TimeSinceLastInputEvent(void); /* strcasecmp.c */ -#if NEED_STRCASECMP +#ifndef HAVE_STRCASECMP #define strcasecmp xstrcasecmp extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2); #endif -#if NEED_STRNCASECMP +#ifndef HAVE_STRNCASECMP #define strncasecmp xstrncasecmp extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n); #endif -#if NEED_STRCASESTR +#ifndef HAVE_STRCASESTR #define strcasestr xstrcasestr extern _X_EXPORT char *xstrcasestr(const char *s, const char *find); #endif -#ifndef HAS_STRLCPY +#ifndef HAVE_STRLCPY extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz); extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz); #endif |