Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation.

This commit is contained in:
christos 2009-10-26 21:14:18 +00:00
parent 7b2c561b05
commit 315c7490d2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/m4/lib/ohash_do.c
View File

@ -68,7 +68,7 @@ ohash_resize(struct ohash *h)
void *
ohash_remove(struct ohash *h, unsigned int i)
{
void *result = (void *)h->t[i].p;
void *result = __UNCONST(h->t[i].p);
if (result == NULL || result == DELETED)
return NULL;
@ -89,7 +89,7 @@ ohash_find(struct ohash *h, unsigned int i)
if (h->t[i].p == DELETED)
return NULL;
else
return (void *)h->t[i].p;
return __UNCONST(h->t[i].p);
}
void *

2
usr.bin/m4/lib/ohash_enum.c
View File

@ -31,6 +31,6 @@ ohash_next(struct ohash *h, unsigned int *pos)
{
for (; *pos < h->size; (*pos)++)
if (h->t[*pos].p != DELETED && h->t[*pos].p != NULL)
return (void *)h->t[(*pos)++].p;
return __UNCONST(h->t[(*pos)++].p);
return NULL;
}

9
usr.bin/m4/lib/strtonum.c
View File

@ -16,7 +16,11 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
__RCSID("$NetBSD: strtonum.c,v 1.2 2009/10/26 21:14:18 christos Exp $");
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
@ -25,6 +29,9 @@
#define TOOSMALL 2
#define TOOLARGE 3
long long
strtonum(const char *numstr, long long minval, long long maxval,
const char **errstrp);
long long
strtonum(const char *numstr, long long minval, long long maxval,
const char **errstrp)