Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > VMS_impls > VMS__MC_shared_impl

changeset 290:c63b498d0a00 Dev_ML tip

find changesets by author, revision, files, or words in the commit message
Fixed post-merge issues -- renames and includes..
author Sean Halle <seanhalle@yahoo.com>
date Thu, 05 Sep 2013 18:49:48 -0700
parents 744b5ff9851e
children
files AnimationMaster.c PR__WL.c PR__structs.h
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/AnimationMaster.c	Thu Sep 05 18:08:14 2013 -0700
     1.2 +++ b/AnimationMaster.c	Thu Sep 05 18:49:48 2013 -0700
     1.3 @@ -316,7 +316,7 @@
     1.4        (*req->createHdlr)(req->langReq, slave, PR_int__give_lang_env(protoLangEnv) );
     1.5     protoMetaTask = PR_int__give_prolog_of_lang_meta_task( task );
     1.6     protoMetaTask->ID         = req->ID; //may be NULL
     1.7 -   protoMetaTask->topLevelFn = req->topLevelFn;
     1.8 +   protoMetaTask->topLevelFn = req->birthFnPtr;
     1.9     protoMetaTask->initData   = req->initData;
    1.10     protoMetaTask->processTaskIsIn = process;
    1.11             

     2.1 --- a/PR__WL.c	Thu Sep 05 18:08:14 2013 -0700
     2.2 +++ b/PR__WL.c	Thu Sep 05 18:49:48 2013 -0700
     2.3 @@ -116,12 +116,12 @@
     2.4   
     2.5  inline
     2.6  void
     2.7 -PR_WL__send_create_task_req( BirthFn fn, void *initData, void *langReq, 
     2.8 +PR_WL__send_create_task_req( BirthFnPtr fn, void *initData, void *langReq, 
     2.9       int32 *taskID, CreateHandler handler, SlaveVP *animSlv, int32 magicNumber)
    2.10   { PRReqst req;
    2.11   
    2.12     req.reqType    = TaskCreate;
    2.13 -   req.topLevelFn = fn;
    2.14 +   req.birthFnPtr = fn;
    2.15     req.initData   = initData;
    2.16     req.ID         = taskID;
    2.17     req.langReq    = langReq;

     3.1 --- a/PR__structs.h	Thu Sep 05 18:08:14 2013 -0700
     3.2 +++ b/PR__structs.h	Thu Sep 05 18:49:48 2013 -0700
     3.3 @@ -143,7 +143,7 @@
     3.4     int32              langMagicNumber;
     3.5     SlaveVP           *requestingSlave;
     3.6     
     3.7 -   BirthFnPtr      topLevelFn;
     3.8 +   BirthFnPtr         birthFnPtr;
     3.9     void              *initData;
    3.10     int32             *ID;
    3.11