Commit 47e2d34c authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Changes to shut the compiler up.

Detail:
  Renamed (meaningless) formal parameter "template" in function declarations.
  Renamed other variables in the C sources too.
  Stops C compiler moaning about the use of symbols reserved for C++.
Admin:
  Required by Toolbox-1_47 and later.

Version 0.02. Tagged as 'Common-0_02'
parent 4dda25c2
/* (0.01)
/* (0.02)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.01
#define Module_MajorVersion_CMHG 0.02
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Jan 1999
#define Module_Date_CMHG 16 Feb 1999
#define Module_MajorVersion "0.01"
#define Module_Version 1
#define Module_MajorVersion "0.02"
#define Module_Version 2
#define Module_MinorVersion ""
#define Module_Date "18 Jan 1999"
#define Module_Date "16 Feb 1999"
......@@ -101,18 +101,18 @@ _kernel_oserror *__zap_window(char *tm,int off,int val)
return NULL;
}
_kernel_oserror *create_from_template(char *template, ObjectID *handle)
_kernel_oserror *create_from_template(char *template_id, ObjectID *handle)
{
_kernel_oserror *er=NULL;
if ((er=_swix(Toolbox_CreateObject, _INR(0,1) | _OUT(0),
1, /* flags */
template,
template_id,
handle)) != NULL) {
mem_free(template,"freeing template copy");
mem_free(template_id,"freeing template copy");
return er;
}
mem_free(template,"freeing template copy");
mem_free(template_id,"freeing template copy");
return NULL;
}
......
......@@ -20,15 +20,15 @@
void *slist_add_new(void **_head,int size,char *tag)
{
SList *new,**head = (SList **)_head;
SList *newl,**head = (SList **)_head;
(void) tag;
new = mem_allocate(size,tag);
if (new) {
new->next = *head;
*head = new;
newl = mem_allocate(size,tag);
if (newl) {
newl->next = *head;
*head = newl;
}
return new;
return newl;
}
void slist_delete_member(void **_head,void *member)
......
......@@ -28,7 +28,7 @@ char *copy_template(char *name);
/* creates object from buffer then frees it */
_kernel_oserror *create_from_template(char *template, ObjectID *handle);
_kernel_oserror *create_from_template(char *template_id, ObjectID *handle);
/* zaps gadget attributes, NOTE: use macro form below */
......
......@@ -75,7 +75,7 @@ typedef struct
typedef struct /* an object template header (after relocation) */
{
ObjectClass class; /* class of the object */
ObjectClass class_id; /* class of the object */
int flags; /* generic flags (see above) */
int version; /* object class module version */
char name[MAX_OBJECT_NAME]; /* name given to template for use in Toolbox_ObjectCreate */
......@@ -219,7 +219,7 @@ typedef struct
typedef struct
{
int code; /* pair of event code and object class */
ObjectClass class; /* used in Toolbox_RegisterPostFilter */
ObjectClass class_id; /* used in Toolbox_RegisterPostFilter */
} EventInterest;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment