diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-07 09:21:18 +0000 |
| commit | b741086f4b268041e1c171c6dc4bb9182e7666d3 (patch) | |
| tree | 02dfe9fd170cddb55b6532de49768133221ef3b6 /libxkbfile/src/XKBfileInt.h | |
| parent | f78ab58911de1fa9a15afffcd4fcdc11ae67c646 (diff) | |
| parent | c73dc01b6de45612b24dc2dd34fba24d81ebf46c (diff) | |
| download | vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.gz vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.tar.bz2 vcxsrv-b741086f4b268041e1c171c6dc4bb9182e7666d3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libxkbfile/src/XKBfileInt.h')
| -rw-r--r-- | libxkbfile/src/XKBfileInt.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libxkbfile/src/XKBfileInt.h b/libxkbfile/src/XKBfileInt.h index 7eb81a0c0..22083fa46 100644 --- a/libxkbfile/src/XKBfileInt.h +++ b/libxkbfile/src/XKBfileInt.h @@ -30,6 +30,7 @@ /* $XFree86$ */ #include "XKBfile.h" +#include <string.h> #ifdef DEBUG #define _XkbLibError(c,l,d) \ @@ -62,11 +63,18 @@ #endif +#include <unistd.h> +#ifdef _MSC_VER +#define inline __inline +#endif + _XFUNCPROTOBEGIN -extern char * _XkbDupString( - char * /* old_str */ -); +static inline +char *_XkbDupString(const char *s) +{ + return s ? strdup(s) : NULL; +} #define _XkbStrCaseEqual(s1,s2) (_XkbStrCaseCmp(s1,s2)==0) |