diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-21 12:49:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-21 12:49:56 +0000 |
commit | 552c31a087911f0090030bcbb7da933c6c988203 (patch) | |
tree | 380b2b87e69b87d82e535bfca0c80a4e54606276 | |
parent | 69f6d457cca88eab8872488f1485a78719850246 (diff) |
songs: Avoid more const warnings
git-svn-id: svn://tug.org/texlive/trunk@32463 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/utils/songs/songs-2.17/src/songidx/authidx.c | 9 | ||||
-rw-r--r-- | Build/source/utils/songs/songs-2.17/src/songidx/titleidx.c | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Build/source/utils/songs/songs-2.17/src/songidx/authidx.c b/Build/source/utils/songs/songs-2.17/src/songidx/authidx.c index be631b26233..05b79083ea0 100644 --- a/Build/source/utils/songs/songs-2.17/src/songidx/authidx.c +++ b/Build/source/utils/songs/songs-2.17/src/songidx/authidx.c @@ -55,9 +55,12 @@ typedef struct wordlist } WORDLIST; -WORDLIST wl_and = { NULL, ws_lit("and") }; -WORDLIST wl_by = { NULL, ws_lit("by") }; -WORDLIST wl_unknown = { NULL, ws_lit("unknown") }; +WCHAR ws_and[] = ws_lit("and"); +WCHAR ws_by[] = ws_lit("by"); +WCHAR ws_unknown[] = ws_lit("unknown"); +WORDLIST wl_and = { NULL, ws_and }; +WORDLIST wl_by = { NULL, ws_by }; +WORDLIST wl_unknown = { NULL, ws_unknown }; /* wl_insert(<wordlist>,<word>) * Insert a word onto the head of a wordlist. */ diff --git a/Build/source/utils/songs/songs-2.17/src/songidx/titleidx.c b/Build/source/utils/songs/songs-2.17/src/songidx/titleidx.c index 9ead78009bc..10794032b29 100644 --- a/Build/source/utils/songs/songs-2.17/src/songidx/titleidx.c +++ b/Build/source/utils/songs/songs-2.17/src/songidx/titleidx.c @@ -49,8 +49,10 @@ typedef struct prefix } PREFIX; -PREFIX pre_A = { NULL, ws_lit("A") }; -PREFIX pre_defaults = { &pre_A, ws_lit("The") }; +WCHAR ws_A[] = ws_lit("A"); +WCHAR ws_The[] = ws_lit("The"); +PREFIX pre_A = { NULL, ws_A }; +PREFIX pre_defaults = { &pre_A, ws_The }; /* freeprefixes(<list>) * Free prefix list <list>. */ |