--- a/scilab/modules/core/src/cpp/pause.cpp +++ b/scilab/modules/core/src/cpp/pause.cpp @@ -11,15 +11,15 @@ * */ -#include "configvariable.hxx" -#include "threadmanagement.hxx" -#include "runner.hxx" - extern "C" { #include "pause.h" } -void pause(void) +#include "configvariable.hxx" +#include "threadmanagement.hxx" +#include "runner.hxx" + +void scipause(void) { ConfigVariable::IncreasePauseLevel(); @@ -43,4 +43,4 @@ //return from console so change mode to initial ConfigVariable::setPromptMode(iOldMode); -} \ No newline at end of file +} --- a/scilab/modules/core/includes/pause.h +++ b/scilab/modules/core/includes/pause.h @@ -15,6 +15,6 @@ #define __PAUSE_H__ #include "dynlib_core.h" -CORE_IMPEXP void pause(void); +CORE_IMPEXP void scipause(void); #endif /* !__PAUSE_H__ */ --- a/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp +++ b/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp @@ -47,7 +47,7 @@ ConfigVariable::macroFirstLine_begin(2); // do pause - pause(); + scipause(); return types::Function::OK; }