浏览代码

cmRtNet.h/c : Corrected mispelling in #ifdef header guards.

On failure of cmThreadMutexWaitOnCondVar() in _cmRtThreadCallback() the
correct result code is now reported.
master
Kevin Larke 9 年前
父节点
当前提交
37b47e21fd
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3
    3
      cmRtNet.h
  2. 1
    1
      cmRtSys.c

+ 3
- 3
cmRtNet.h 查看文件

@@ -1,5 +1,5 @@
1
-#ifndef cmNet_h
2
-#define cmNet_h
1
+#ifndef cmRtNet_h
2
+#define cmRtNet_h
3 3
 
4 4
 #ifdef __cplusplus
5 5
 extern "C" {
@@ -12,7 +12,7 @@ extern "C" {
12 12
    unique among all other nodes on the network. A node also has a set of application 
13 13
    defined 'endpoints'.  Each endpoint has a label and id that is unique among all 
14 14
    other endpoints on the same node.  Endpoints on different nodes however may share
15
-   use the same label and id.  Endpoints are used by remote senders to identify 
15
+   the same label and id.  Endpoints are used by remote senders to identify 
16 16
    a particular receiver which is sharing the node with other receivers.  Endpoints
17 17
    are therefore analogous to port numbers on sockets.
18 18
 

+ 1
- 1
cmRtSys.c 查看文件

@@ -419,7 +419,7 @@ bool _cmRtThreadCallback(void* arg)
419 419
         cmSleepMs(cp->noBlockSleepMs);
420 420
       else
421 421
       {
422
-        if( cmThreadMutexWaitOnCondVar(cp->engMutexH,false) != kOkRtRC )
422
+        if( (rc = cmThreadMutexWaitOnCondVar(cp->engMutexH,false)) != kOkRtRC )
423 423
         {
424 424
           cmThreadMutexUnlock(cp->engMutexH);
425 425
           _cmRtError(cp->p,rc,"The cmRtSys cond. var. wait failed.");

正在加载...
取消
保存