2000-05-19 08:34:13 +00:00
|
|
|
--- ppm/ximtoppm.c.orig Sun Apr 9 07:44:31 2000
|
|
|
|
|
+++ ppm/ximtoppm.c Mon May 8 00:00:00 2000
|
|
|
|
|
@@ -419,13 +419,23 @@
|
2000-04-27 11:28:19 +00:00
|
|
|
*/
|
|
|
|
|
unsigned int option_def_index;
|
|
|
|
|
|
|
|
|
|
+ /* Create the OptStruct structure describing our options */
|
|
|
|
|
+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
|
|
|
|
|
+ option_def[option_def_index].shortName = (shortvalue); \
|
|
|
|
|
+ option_def[option_def_index].longName = (longvalue); \
|
|
|
|
|
+ option_def[option_def_index].type = (typevalue); \
|
|
|
|
|
+ option_def[option_def_index].arg = (outputvalue); \
|
|
|
|
|
+ option_def[option_def_index].flags = (flagvalue); \
|
|
|
|
|
+ option_def_index++; \
|
|
|
|
|
+ }
|
|
|
|
|
option_def_index = 0; /* incremented by OPTENTRY */
|
|
|
|
|
OPTENTRY(0, "alphaout", OPT_STRING, &cmdline_p->alpha_filename, 0);
|
|
|
|
|
+ option_def[option_def_index].type = OPT_END;
|
|
|
|
|
|
|
|
|
|
/* Set the defaults */
|
|
|
|
|
cmdline_p->alpha_filename = NULL;
|
|
|
|
|
|
|
|
|
|
- pm_optParseOptions(&argc, argv, option_def, 0);
|
|
|
|
|
+ optParseOptions(&argc, argv, option_def, 0);
|
|
|
|
|
/* Uses and sets argc, argv, and all of *cmdline_p. */
|
|
|
|
|
|
|
|
|
|
if (argc - 1 == 0)
|
