Changes to make SICS compile on OSX Maverick with clang

This commit is contained in:
Mark Könnecke
2014-03-14 09:48:14 +01:00
parent a43e3838e3
commit bc31c6cd1e
30 changed files with 49 additions and 53 deletions

View File

@@ -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;