$NetBSD: patch-aa,v 1.11 2006/12/11 08:13:13 dan Exp $

--- cmd.hh	b603bd9f4ad5e79d24d128694352376d0d5719a6
+++ cmd.hh	142898bfbb49704a60be81e5e01ddef553d32ea6
@@ -35,7 +35,7 @@ namespace commands
     std::string params_;
     std::string desc_;
     bool use_workspace_options;
-    options::options_type options;
+    options::options_type opts;
     command(std::string const & n,
             std::string const & g,
             std::string const & p,
@@ -180,7 +180,7 @@ namespace commands {                    
     cmd_ ## C() : command(#C, realcommand##_cmd.cmdgroup,            \
                           realcommand##_cmd.params_,                 \
                           realcommand##_cmd.desc_, true,             \
-                          realcommand##_cmd.options)                 \
+                          realcommand##_cmd.opts)                 \
     {}                                                               \
     virtual std::string desc();                                      \
     virtual void exec(app_state & app,                               \
@@ -206,7 +206,7 @@ namespace automation {
   {
     std::string name;
     std::string params;
-    options::options_type options;
+    options::options_type opts;
     automate(std::string const & n, std::string const & p,
              options::options_type const & o);
     virtual void run(std::vector<utf8> args,
