=================================================================== RCS file: /cvs/mandoc/mandocdb.c,v retrieving revision 1.49.2.6 retrieving revision 1.49.2.8 diff -u -p -r1.49.2.6 -r1.49.2.8 --- mandoc/mandocdb.c 2013/10/01 00:52:58 1.49.2.6 +++ mandoc/mandocdb.c 2013/10/05 20:30:05 1.49.2.8 @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.49.2.6 2013/10/01 00:52:58 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.49.2.8 2013/10/05 20:30:05 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012 Ingo Schwarze @@ -41,6 +41,7 @@ # include # include #else +# include # include #endif @@ -619,6 +620,8 @@ index_merge(const struct of *of, struct mparse *mp, uint64_t vbuf[2]; char type; + static char emptystring[] = ""; + if (warnings) { files = NULL; hash_reset(&files); @@ -737,7 +740,7 @@ index_merge(const struct of *of, struct mparse *mp, val.data = NULL; val.size = 0; if (0 == skip) - val.data = ""; + val.data = emptystring; else { ch = (*files->get)(files, &key, &val, 0); if (ch < 0) {