aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-03-02 11:01:43 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-02 11:01:43 +0100
commit554a6fa760de47c497abcc91bb5f1f9b2756a407 (patch)
treef59b0c8ddd14dc414c952710b2010477107cde06 /nx-X11/programs/Xserver/hw/nxagent/Rootless.c
parentf42d36fb73e096113a948a04279b752689f157bc (diff)
parent9c3669c6b7ff19013b3684bb74d98ec3d121e329 (diff)
downloadnx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.gz
nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.tar.bz2
nx-libs-554a6fa760de47c497abcc91bb5f1f9b2756a407.zip
Merge branch 'sunweaver-pr/constify-atom-name-strings' into 3.6.x
Attributes GH PR #363: https://github.com/ArcticaProject/nx-libs/pull/363
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Rootless.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index bb19b3458..eabf719c4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -455,7 +455,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
unsigned long nUnits;
void *value;
{
- char *propertyS, *typeS;
+ const char *propertyS, *typeS;
Atom propertyX, typeX;
char *output = NULL;
nxagentWMHints wmHints;
@@ -634,7 +634,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
{
XlibAtom *atoms = malloc(nUnits * sizeof(*atoms));
Atom *input = value;
- char *atomName = NULL;
+ const char *atomName = NULL;
int i;
int j = 0;
@@ -834,7 +834,7 @@ void nxagentImportProperty(Window window,
WMState wmState;
char *output = NULL;
- char *typeS;
+ const char *typeS;
pWin = nxagentWindowPtr(window);