diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | 39874e472e540ca1bb923b97b52900e1d60439cc (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| download | Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.gz Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.bz2 Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci')
| -rw-r--r-- | 2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci index 4a2906c0..35607f6d 100644 --- a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci +++ b/2.3-1/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 |