# HG changeset patch
# User Sean Halle <seanhalle@yahoo.com>
# Date 1378432188 25200
# Node ID c63b498d0a006dd464d7ec78069e0d67af8b5c4f
# Parent  744b5ff9851e55d4170f7c2249b8551fce88c776
Fixed post-merge issues -- renames and includes..

diff -r 744b5ff9851e -r c63b498d0a00 AnimationMaster.c
--- a/AnimationMaster.c	Thu Sep 05 18:08:14 2013 -0700
+++ b/AnimationMaster.c	Thu Sep 05 18:49:48 2013 -0700
@@ -316,7 +316,7 @@
       (*req->createHdlr)(req->langReq, slave, PR_int__give_lang_env(protoLangEnv) );
    protoMetaTask = PR_int__give_prolog_of_lang_meta_task( task );
    protoMetaTask->ID         = req->ID; //may be NULL
-   protoMetaTask->topLevelFn = req->topLevelFn;
+   protoMetaTask->topLevelFn = req->birthFnPtr;
    protoMetaTask->initData   = req->initData;
    protoMetaTask->processTaskIsIn = process;
            
diff -r 744b5ff9851e -r c63b498d0a00 PR__WL.c
--- a/PR__WL.c	Thu Sep 05 18:08:14 2013 -0700
+++ b/PR__WL.c	Thu Sep 05 18:49:48 2013 -0700
@@ -116,12 +116,12 @@
  
 inline
 void
-PR_WL__send_create_task_req( BirthFn fn, void *initData, void *langReq, 
+PR_WL__send_create_task_req( BirthFnPtr fn, void *initData, void *langReq, 
      int32 *taskID, CreateHandler handler, SlaveVP *animSlv, int32 magicNumber)
  { PRReqst req;
  
    req.reqType    = TaskCreate;
-   req.topLevelFn = fn;
+   req.birthFnPtr = fn;
    req.initData   = initData;
    req.ID         = taskID;
    req.langReq    = langReq;
diff -r 744b5ff9851e -r c63b498d0a00 PR__structs.h
--- a/PR__structs.h	Thu Sep 05 18:08:14 2013 -0700
+++ b/PR__structs.h	Thu Sep 05 18:49:48 2013 -0700
@@ -143,7 +143,7 @@
    int32              langMagicNumber;
    SlaveVP           *requestingSlave;
    
-   BirthFnPtr      topLevelFn;
+   BirthFnPtr         birthFnPtr;
    void              *initData;
    int32             *ID;