diff VMS.h @ 262:aa79134dbc88

merge
author Sean Halle <seanhalle@yahoo.com>
date Wed, 24 Oct 2012 00:00:22 -0700
parents 4c7414df4f0e
children 094ad1bdeaec
line diff
     1.1 --- a/VMS.h	Mon Sep 03 03:34:54 2012 -0700
     1.2 +++ b/VMS.h	Wed Oct 24 00:00:22 2012 -0700
     1.3 @@ -282,7 +282,7 @@
     1.4  
     1.5  //==============    ===============
     1.6  
     1.7 -inline SlaveVP *
     1.8 +SlaveVP *
     1.9  VMS_int__create_slaveVP( TopLevelFnPtr fnPtr, void *dataParam );
    1.10  #define VMS_PI__create_slaveVP VMS_int__create_slaveVP
    1.11  #define VMS_WL__create_slaveVP VMS_int__create_slaveVP
    1.12 @@ -292,19 +292,19 @@
    1.13  SlaveVP *
    1.14  VMS_ext__create_slaveVP( TopLevelFnPtr fnPtr, void *dataParam );
    1.15  
    1.16 -inline SlaveVP *
    1.17 +SlaveVP *
    1.18  VMS_int__create_slaveVP_helper( SlaveVP *newSlv,       TopLevelFnPtr  fnPtr,
    1.19                                  void      *dataParam, void           *stackLocs );
    1.20  
    1.21 -inline void
    1.22 +void
    1.23  VMS_int__reset_slaveVP_to_TopLvlFn( SlaveVP *slaveVP, TopLevelFnPtr fnPtr,
    1.24                                void    *dataParam);
    1.25  
    1.26 -inline void
    1.27 +void
    1.28  VMS_int__point_slaveVP_to_OneParamFn( SlaveVP *slaveVP, void *fnPtr,
    1.29                                void    *param);
    1.30  
    1.31 -inline void
    1.32 +void
    1.33  VMS_int__point_slaveVP_to_TwoParamFn( SlaveVP *slaveVP, void *fnPtr,
    1.34                                void    *param1, void *param2);
    1.35  
    1.36 @@ -330,12 +330,12 @@
    1.37  //No WL version -- not safe!  if use in WL, be sure data rd & wr is stable
    1.38  
    1.39  
    1.40 -inline void
    1.41 +void
    1.42  VMS_int__get_master_lock();
    1.43  
    1.44  #define VMS_int__release_master_lock() _VMSMasterEnv->masterLock = UNLOCKED
    1.45  
    1.46 -inline uint32_t
    1.47 +uint32_t
    1.48  VMS_int__randomNumber();
    1.49  
    1.50  //==============  Request Related  ===============
    1.51 @@ -343,30 +343,30 @@
    1.52  void
    1.53  VMS_int__suspend_slaveVP_and_send_req( SlaveVP *callingSlv );
    1.54  
    1.55 -inline void
    1.56 +void
    1.57  VMS_WL__add_sem_request_in_mallocd_VMSReqst( void *semReqData, SlaveVP *callingSlv );
    1.58  
    1.59 -inline void
    1.60 +void
    1.61  VMS_WL__send_sem_request( void *semReqData, SlaveVP *callingSlv );
    1.62  
    1.63  void
    1.64  VMS_WL__send_create_slaveVP_req( void *semReqData, SlaveVP *reqstingSlv );
    1.65  
    1.66 -void inline
    1.67 +void 
    1.68  VMS_WL__send_dissipate_req( SlaveVP *prToDissipate );
    1.69  
    1.70 -inline void
    1.71 +void
    1.72  VMS_WL__send_VMSSem_request( void *semReqData, SlaveVP *callingSlv );
    1.73  
    1.74  VMSReqst *
    1.75  VMS_PI__take_next_request_out_of( SlaveVP *slaveWithReq );
    1.76  //#define VMS_PI__take_next_request_out_of( slave ) slave->requests
    1.77  
    1.78 -//inline void *
    1.79 +//void *
    1.80  //VMS_PI__take_sem_reqst_from( VMSReqst *req );
    1.81  #define VMS_PI__take_sem_reqst_from( req ) req->semReqData
    1.82  
    1.83 -void inline
    1.84 +void 
    1.85  VMS_PI__handle_VMSSemReq( VMSReqst *req, SlaveVP *requestingSlv, void *semEnv,
    1.86                         ResumeSlvFnPtr resumeSlvFnPtr );
    1.87  
    1.88 @@ -378,7 +378,7 @@
    1.89  
    1.90  
    1.91  //========================= Utilities =======================
    1.92 -inline char *
    1.93 +char *
    1.94  VMS_int__strDup( char *str );
    1.95  
    1.96