summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/string/disp
diff options
context:
space:
mode:
authorBrijeshcr2017-07-07 18:19:45 +0530
committerGitHub2017-07-07 18:19:45 +0530
commit5258fe20f21514eca1f7dc4ee384fe63c35c68a1 (patch)
treec0424024c16aa122a5a38686dfed75a4c4866e95 /2.3-1/src/c/string/disp
parent8d1da9568248c9a0572da08a7039e75e84d782b0 (diff)
parenta505550d38b2b886c61863a85be67faf02ad604b (diff)
downloadScilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.gz
Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.bz2
Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.zip
Merge pull request #12 from yash1112/master
SCi2cDeps updated, Windows compatibility resolved
Diffstat (limited to '2.3-1/src/c/string/disp')
-rw-r--r--2.3-1/src/c/string/disp/ddispa.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/src/c/string/disp/ddispa.c b/2.3-1/src/c/string/disp/ddispa.c
index 29aaceeb..3ae1d15a 100644
--- a/2.3-1/src/c/string/disp/ddispa.c
+++ b/2.3-1/src/c/string/disp/ddispa.c
@@ -16,7 +16,11 @@ double ddispa (double* in, int rows, int columns){
int i = 0,j = 0;
for (i = 0; i < rows; ++i) {
+<<<<<<< HEAD
for (j=0;j<columns;j++) printf (" %e ", in[i+j*rows]);
+=======
+ for (j=0;j<columns;j++) printf (" %1.20f ", in[i+j*rows]);
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
printf("\n");
}
return 0;