Changes to make SICS compile on OSX Maverick with clang
This commit is contained in:
@@ -70,7 +70,7 @@ static MotorFunction TextToFunc(char *txt)
|
||||
}
|
||||
count++;
|
||||
}
|
||||
return -1;
|
||||
return None;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
@@ -112,7 +112,7 @@ static int ConfigureCmd(pSICSOBJ self, SConnection * pCon,
|
||||
}
|
||||
|
||||
mf = TextToFunc(v.v.text);
|
||||
if (mf < 0) {
|
||||
if (mf == None) {
|
||||
SCPrintf(pCon, eError,
|
||||
"ERROR: failed to map %s to configuration parameter",
|
||||
v.v.text);
|
||||
@@ -167,7 +167,7 @@ static int MotorCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
|
||||
}
|
||||
|
||||
mf = TextToFunc(par[0]->value.v.text);
|
||||
if (mf < 0) {
|
||||
if (mf == None) {
|
||||
SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor",
|
||||
par[0]->value.v.text);
|
||||
return 0;
|
||||
@@ -198,7 +198,7 @@ static int MotorNamCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
|
||||
}
|
||||
|
||||
mf = TextToFunc(par[0]->value.v.text);
|
||||
if (mf < 0) {
|
||||
if (mf == None) {
|
||||
SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor",
|
||||
par[0]->value.v.text);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user