diff options
author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXpm/src/data.c | |
parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXpm/src/data.c')
-rw-r--r-- | libXpm/src/data.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libXpm/src/data.c b/libXpm/src/data.c index 347aa46a2..898889c37 100644 --- a/libXpm/src/data.c +++ b/libXpm/src/data.c @@ -61,7 +61,8 @@ ParseComment(xpmData *data) register char c; register unsigned int n = 0; unsigned int notend; - char *s, *s2; + char *s; + const char *s2; s = data->Comment; *s = data->Bcmt[0]; @@ -119,7 +120,8 @@ ParseComment(xpmData *data) register int c; register unsigned int n = 0, a; unsigned int notend; - char *s, *s2; + char *s; + const char *s2; s = data->Comment; *s = data->Bcmt[0]; |