summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-02 10:59:38 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-02 10:59:38 +0200
commit776e88f95266222c59cff0e1484a535e1ff69c14 (patch)
tree495fa51688e74dc7fc30eb60232680a08be65cf9 /scilab/modules/shell
parent871dc946438ba193a95fa0d6e06ac239e0f323fe (diff)
parente511cf49f7ba96bcf44b4e522fc4af994d1c6b93 (diff)
downloadscilab-776e88f95266222c59cff0e1484a535e1ff69c14.zip
scilab-776e88f95266222c59cff0e1484a535e1ff69c14.tar.gz
Merge commit 'origin/5.2'
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/src/c/others/zzledt.c8
-rw-r--r--scilab/modules/shell/src/c/scilines.c15
2 files changed, 14 insertions, 9 deletions
diff --git a/scilab/modules/shell/src/c/others/zzledt.c b/scilab/modules/shell/src/c/others/zzledt.c
index 44c41b8..6e5b381 100644
--- a/scilab/modules/shell/src/c/others/zzledt.c
+++ b/scilab/modules/shell/src/c/others/zzledt.c
@@ -32,12 +32,14 @@
32# include <ncurses.h> 32# include <ncurses.h>
33#endif 33#endif
34 34
35#ifdef HAVE_TERMCAP_H
36#include <termcap.h>
37#endif
38
39#ifndef HAVE_TERMCAP_H
35#ifdef HAVE_TERM_H 40#ifdef HAVE_TERM_H
36#include <term.h> 41#include <term.h>
37#endif 42#endif
38
39#ifdef HAVE_TERMCAP_H
40#include <termcap.h>
41#endif 43#endif
42 44
43#include "MALLOC.h" 45#include "MALLOC.h"
diff --git a/scilab/modules/shell/src/c/scilines.c b/scilab/modules/shell/src/c/scilines.c
index 1fd549e..23b02286 100644
--- a/scilab/modules/shell/src/c/scilines.c
+++ b/scilab/modules/shell/src/c/scilines.c
@@ -27,13 +27,16 @@
27# include <ncurses.h> 27# include <ncurses.h>
28# endif 28# endif
29 29
30# ifdef HAVE_TERM_H
31# include <term.h>
32# endif
33 30
34# ifdef HAVE_TERMCAP_H 31#ifdef HAVE_TERMCAP_H
35# include <termcap.h> 32#include <termcap.h>
36# endif 33#endif
34
35#ifndef HAVE_TERMCAP_H
36#ifdef HAVE_TERM_H
37#include <term.h>
38#endif
39#endif
37 40
38#endif /* !defined(_MSC_VER) */ 41#endif /* !defined(_MSC_VER) */
39 42