Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37604103
en ru br
Репозитории ALT
S:6.0.2-alt5
5.1: 5.1.1-alt3
4.1: 4.1.2-alt4.M41.1
4.0: 4.1.2-alt5.M40.1
3.0: 3.0-alt1
www.altlinux.org/Changes

Группа :: Науки/Математика
Пакет: scilab

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: scilab-alt-fix-conflict-with-system-pause.patch
Скачать


diff --git a/scilab/modules/ast/src/cpp/ast/debugmanager.cpp b/scilab/modules/ast/src/cpp/ast/debugmanager.cpp
index ef476bf568a..d05b89b8f84 100644
--- a/scilab/modules/ast/src/cpp/ast/debugmanager.cpp
+++ b/scilab/modules/ast/src/cpp/ast/debugmanager.cpp
@@ -532,7 +532,7 @@ void DebuggerManager::internal_stop()
     // wait inside pause
     try
     {
-        pause();
+        scilab_pause();
     }
     catch (const ast::InternalAbort& ia)
     {
diff --git a/scilab/modules/core/includes/pause.h b/scilab/modules/core/includes/pause.h
index 22020d45341..31be4667faa 100644
--- 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 scilab_pause(void);
 
 #endif /* !__PAUSE_H__ */
diff --git a/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp b/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp
index 8b60291ef09..6903d65a3fd 100644
--- a/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp
+++ b/scilab/modules/core/sci_gateway/cpp/sci_pause.cpp
@@ -47,7 +47,7 @@ types::Function::ReturnValue sci_pause(types::typed_list &in, int _iRetCount, ty
     ConfigVariable::macroFirstLine_begin(2);
 
     // do pause
-    pause();
+    scilab_pause();
 
     return types::Function::OK;
 }
diff --git a/scilab/modules/core/src/cpp/pause.cpp b/scilab/modules/core/src/cpp/pause.cpp
index c1be6653609..8f15a8567cc 100644
--- a/scilab/modules/core/src/cpp/pause.cpp
+++ b/scilab/modules/core/src/cpp/pause.cpp
@@ -19,7 +19,7 @@ extern "C" {
 #include "pause.h"
 }
 
-void pause(void)
+void scilab_pause(void)
 {
     ConfigVariable::IncreasePauseLevel();
 
@@ -43,4 +43,4 @@ void pause(void)
 
     //return from console so change mode to initial
     ConfigVariable::setPromptMode(iOldMode);
-}
\ No newline at end of file
+}
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin