aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-29 14:05:12 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-05 08:11:42 +0200
commit141316af0d45968b95c3fb5c08516dd6e93ac64e (patch)
tree1749b37d2b23df52353327e6ef53e9536dd9c7fc /nx-X11
parentf46af7de8496522e0d90448497fd019afafc8747 (diff)
downloadnx-libs-141316af0d45968b95c3fb5c08516dd6e93ac64e.tar.gz
nx-libs-141316af0d45968b95c3fb5c08516dd6e93ac64e.tar.bz2
nx-libs-141316af0d45968b95c3fb5c08516dd6e93ac64e.zip
Xserver/os/log.c: Make sure strlcpy is defined in log.c. Immitate what is done in X.org.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/include/os.h7
-rw-r--r--nx-X11/programs/Xserver/os/log.c1
2 files changed, 8 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,
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index 780a05767..d8640b5fd 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -107,6 +107,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <stdlib.h> /* for malloc() */
#include <errno.h>
+#include "input.h"
#include "site.h"
#include "opaque.h"