OSLib 6 problems

[Tom Hughes]

In message <dbd836ae49.tom at compton.compton.nu>
          Tom Hughes <tom at compton.nu> wrote:

> Secondly, both wimp_MESSAGE_LIST() and toolbox_ACTION_LIST() are broken
> as they try and include xxx_MEMBERS which doesn't exist because there
> are no non-variable members. This must be my fault in the DefMod edits
> although I thought I'd avoided that problem. I shall look at is tonight
> and try and get a patch for DefMod.

The patch in question is attached...

Tom

-- 
Tom Hughes (tom at compton.nu)
http://www.compton.nu/
...Hospital: A workshop for the repair of faulty humans.
-------------- next part --------------
Index: cheader
===================================================================
RCS file: /home/cvs/riscos/oslib/Tools/DefMod/c/cheader,v
retrieving revision 1.3
diff -c -r1.3 cheader
*** cheader	2000/04/06 22:45:05	1.3
--- cheader	2000/04/12 22:33:45
***************
*** 804,813 ****
                       macro_name)) < 0)
                    goto finish;
  
!                if ((rc = fprintf (file,
!                      "struct \\\n      {  %s_MEMBERS \\\n         ",
!                      macro_name)) < 0)
                    goto finish;
                 if ((rc = Print_Decl (file, t->data AS list.members [i],
                       NULL, t->data AS list.members [i]->name, TRUE, 0)) < 0)
                    goto finish;
--- 804,815 ----
                       macro_name)) < 0)
                    goto finish;
  
!                if ((rc = fprintf (file, "struct \\\n      {  ")) < 0)
                    goto finish;
+                if (t->data AS list.count > 1)
+                   if ((rc = fprintf (file, "%s_MEMBERS \\\n         ",
+                         macro_name)) < 0)
+                      goto finish;
                 if ((rc = Print_Decl (file, t->data AS list.members [i],
                       NULL, t->data AS list.members [i]->name, TRUE, 0)) < 0)
                    goto finish;