diff options
Diffstat (limited to 'macros/CCodeGeneration/JoinDeclarAndCcode.sci')
| -rw-r--r-- | macros/CCodeGeneration/JoinDeclarAndCcode.sci | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.sci b/macros/CCodeGeneration/JoinDeclarAndCcode.sci index 4a2906c0..35607f6d 100644 --- a/macros/CCodeGeneration/JoinDeclarAndCcode.sci +++ b/macros/CCodeGeneration/JoinDeclarAndCcode.sci @@ -146,17 +146,10 @@ PrintStringInfo('** --- C code. ---',CPass2FileName,'file','y'); PrintStringInfo('** ---------------',CPass2FileName,'file','y'); PrintStringInfo('*/',CPass2FileName,'file','y'); -<<<<<<< HEAD //if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName)) //Add wiringPiSetup() function as it is required // PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y'); //end -======= -if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName)) - //Add wiringPiSetup() function as it is required - PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y'); -end ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Copy the remaining part of V1 in V2. --- while (~meof(CPass1V1FileFid)) // #RNU_RES_B |