diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:34:17 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:34:17 +0200 |
commit | 320a8cc0c7fa472970bc3698c7e77b6406ca343b (patch) | |
tree | d13d3a78686c3d44fd4d89adfd1b57ddd4274533 /nx-X11/programs/Xserver/include | |
parent | 854f3fa49351ec72da432f195806162fcf5e5ddc (diff) | |
parent | b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 (diff) | |
download | nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.gz nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.bz2 nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.zip |
Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.x
Attributes GH PR #168: https://github.com/ArcticaProject/nx-libs/pull/168
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Mon, 04 Jul 2016 11:15:20 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/include')
-rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index aaff63811..6e629c42f 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -457,6 +457,13 @@ extern void AbortDDX(void); extern void ddxGiveUp(void); extern int TimeSinceLastInputEvent(void); +#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 + /* Logging. */ typedef enum _LogParameter { XLOG_FLUSH, |