--- ppm/ppmcolormask.c.orig	Fri Apr 14 16:06:33 2000
+++ ppm/ppmcolormask.c	Mon May  8 00:00:00 2000
@@ -4,6 +4,7 @@
 #include <string.h>
 #include "ppm.h"
 #include "pbm.h"
+#include "shhopt.h"
 
 static struct cmdline_info {
     /* All the information the user supplied in the command line,
@@ -84,13 +85,23 @@
          */
     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('v', "verbose",    OPT_FLAG,   &cmdline_p->verbose,        0);
+    option_def[option_def_index].type = OPT_END;
 
     /* Set the defaults */
     cmdline_p->verbose = 0;
 
-    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)