summaryrefslogtreecommitdiffstatshomepage
path: root/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main.c')
-rw-r--r--main.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/main.c b/main.c
index 523be512..79c5f1f3 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.44 2009/09/21 13:06:13 kristaps Exp $ */
+/* $Id: main.c,v 1.45 2009/10/13 10:21:24 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -20,6 +20,7 @@
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -27,6 +28,8 @@
#include "mdoc.h"
#include "man.h"
+#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a))
+
/* Account for FreeBSD and Linux in our declarations. */
#ifdef __linux__
@@ -576,7 +579,7 @@ static int
foptions(int *fflags, char *arg)
{
char *v, *o;
- char *toks[7];
+ const char *toks[7];
toks[0] = "ign-scope";
toks[1] = "no-ign-escape";
@@ -588,7 +591,7 @@ foptions(int *fflags, char *arg)
while (*arg) {
o = arg;
- switch (getsubopt(&arg, toks, &v)) {
+ switch (getsubopt(&arg, UNCONST(toks), &v)) {
case (0):
*fflags |= IGN_SCOPE;
break;
@@ -622,7 +625,7 @@ static int
woptions(int *wflags, char *arg)
{
char *v, *o;
- char *toks[3];
+ const char *toks[3];
toks[0] = "all";
toks[1] = "error";
@@ -630,7 +633,7 @@ woptions(int *wflags, char *arg)
while (*arg) {
o = arg;
- switch (getsubopt(&arg, toks, &v)) {
+ switch (getsubopt(&arg, UNCONST(toks), &v)) {
case (0):
*wflags |= WARN_WALL;
break;