185,187c185,187
< tArgList * argl = odesc->optCookie;
< int argct = argl->useCt;
< void ** poptv = (void **)(argl->apzArgs);
---
> tArgList * argl = odesc->optCookie;
> int argct = argl->useCt;
> const void ** poptv = VOIDP(argl->apzArgs);
195c195
< res = (tOptionValue *)*poptv;
---
> res = (const tOptionValue *)*poptv;
252c252
< tOptionValue * res = NULL;
---
> const tOptionValue * res = NULL;
267,269c267,269
< tArgList * argl = odesc->optCookie;
< int ct = argl->useCt;
< void ** poptv = (void **)argl->apzArgs;
---
> tArgList * argl = odesc->optCookie;
> int ct = argl->useCt;
> const void ** poptv = VOIDP(argl->apzArgs);
272c272
< tOptionValue * pOV = *(poptv++);
---
> const tOptionValue * pOV = *(poptv++);
318,319c318,319
< tArgList * arg_list;
< tOptionValue * res = NULL;
---
> tArgList * arg_list;
> const tOptionValue * res = NULL;
328,329c328,329
< int ct = arg_list->useCt;
< void ** ovlist = (void **)(arg_list->apzArgs);
---
> int ct = arg_list->useCt;
> const void ** ovlist = VOIDP(arg_list->apzArgs);
332c332
< res = (tOptionValue *)*ovlist;
---
> res = (const tOptionValue *)*ovlist;
335c335
< tOptionValue * opt_val = *(ovlist++);
---
> const tOptionValue * opt_val = *(ovlist++);
377,379c377,379
< tArgList * arg_list;
< tOptionValue * res = NULL;
< int err = EINVAL;
---
> tArgList * arg_list;
> const tOptionValue * res = NULL;
> int err = EINVAL;
387,388c387,388
< int ct = arg_list->useCt;
< void ** o_list = (void **)(arg_list->apzArgs);
---
> int ct = arg_list->useCt;
> const void ** o_list = VOIDP(arg_list->apzArgs);
391c391
< tOptionValue * nov = *(o_list++);
---
> const tOptionValue * nov = *(o_list++);
398c398
< res = (tOptionValue *)*o_list;
---
> res = (const tOptionValue *)*o_list;