summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/modules/fileio/LibScilab_Import.def1
-rw-r--r--scilab/modules/fileio/src/c/do_xxprintf.c8
2 files changed, 7 insertions, 2 deletions
diff --git a/scilab/modules/fileio/LibScilab_Import.def b/scilab/modules/fileio/LibScilab_Import.def
index 05e109a..4b93aaf 100644
--- a/scilab/modules/fileio/LibScilab_Import.def
+++ b/scilab/modules/fileio/LibScilab_Import.def
@@ -43,4 +43,5 @@ EXPORTS
43 getWarningMode 43 getWarningMode
44 callFunctionFromGateway 44 callFunctionFromGateway
45 freeArrayOfString 45 freeArrayOfString
46 getScilabMode
46 47
diff --git a/scilab/modules/fileio/src/c/do_xxprintf.c b/scilab/modules/fileio/src/c/do_xxprintf.c
index 09d9975..79af87b 100644
--- a/scilab/modules/fileio/src/c/do_xxprintf.c
+++ b/scilab/modules/fileio/src/c/do_xxprintf.c
@@ -18,7 +18,8 @@
18#include "stack-c.h" 18#include "stack-c.h"
19#include "do_xxprintf.h" 19#include "do_xxprintf.h"
20#include "Scierror.h" 20#include "Scierror.h"
21#include "sciprint.h" 21#include "Scierror.h"
22#include "scilabmode.h"
22#include "localization.h" 23#include "localization.h"
23#include "set_xxprintf.h" 24#include "set_xxprintf.h"
24#include "fileio.h" 25#include "fileio.h"
@@ -193,7 +194,10 @@ int do_xxprintf (char *fname, FILE *fp, char *format, int nargs, int argcount, i
193 break; 194 break;
194 case 'n': 195 case 'n':
195#ifdef _MSC_VER 196#ifdef _MSC_VER
196 if ( fp == stdout ) (*xxprintf) ((VPTR) target, "\r"); 197 if (getScilabMode() != SCILAB_STD)
198 {
199 if ( fp == stdout ) (*xxprintf) ((VPTR) target, "\r");
200 }
197#endif 201#endif
198 (*xxprintf) ((VPTR) target, "\n"); 202 (*xxprintf) ((VPTR) target, "\n");
199 currentchar++; 203 currentchar++;