summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab/modules/dynamic_link
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/help/en_US/call.xml16
2 files changed, 11 insertions, 6 deletions
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index b633ba5..c7bcce2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -260,6 +260,7 @@ LD = @LD@
260LDFLAGS = @LDFLAGS@ 260LDFLAGS = @LDFLAGS@
261LIBICONV = @LIBICONV@ 261LIBICONV = @LIBICONV@
262LIBINTL = @LIBINTL@ 262LIBINTL = @LIBINTL@
263LIBM = @LIBM@
263LIBOBJS = @LIBOBJS@ 264LIBOBJS = @LIBOBJS@
264LIBS = @LIBS@ 265LIBS = @LIBS@
265LIBTOOL = @LIBTOOL@ 266LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/dynamic_link/help/en_US/call.xml b/scilab/modules/dynamic_link/help/en_US/call.xml
index 4adc296..b54ab8c 100644
--- a/scilab/modules/dynamic_link/help/en_US/call.xml
+++ b/scilab/modules/dynamic_link/help/en_US/call.xml
@@ -86,9 +86,13 @@
86 86
87 <itemizedlist> 87 <itemizedlist>
88 <listitem> 88 <listitem>
89 <para>with Scilab "<literal>link</literal>" command (incremental 89 <para>with Scilab "<literal>link</literal>" command (dynamical
90 "soft" linking) during the Scilab session.(see 90 linking) during the Scilab session.(see
91 <literal>link</literal>)</para> 91 <literal>link</literal>)</para>
92
93 <para>On Windows, C functions must use cdecl calling convention name
94 (see options in your C compiler(default calling convention for x86 C
95 compilers)).</para>
92 </listitem> 96 </listitem>
93 </itemizedlist> 97 </itemizedlist>
94 98
@@ -194,13 +198,13 @@
194 <refsection> 198 <refsection>
195 <title>Examples</title> 199 <title>Examples</title>
196 200
197 <programlisting role="example"><![CDATA[ 201 <programlisting role="example">
198//Example 1 with a simple C code 202//Example 1 with a simple C code
199f1=['#include <math.h>' 203f1=['#include &lt;math.h&gt;'
200 'void fooc(double c[],double a[],double *b,int *m,int *n)' 204 'void fooc(double c[],double a[],double *b,int *m,int *n)'
201 '{' 205 '{'
202 ' int i;' 206 ' int i;'
203 ' for ( i =0 ; i < (*m)*(*n) ; i++) ' 207 ' for ( i =0 ; i &lt; (*m)*(*n) ; i++) '
204 ' c[i] = sin(a[i]) + *b; ' 208 ' c[i] = sin(a[i]) + *b; '
205 '}']; 209 '}'];
206 210
@@ -251,7 +255,7 @@ exec loader.sce
251a=[1,2,3;4,5,6];b= %pi; 255a=[1,2,3;4,5,6];b= %pi;
252[m,n]=size(a); 256[m,n]=size(a);
253c=call("foof",a,2,"d",b,3,"d",m,4,"i",n,5,"i","out",[m,n],1,"d"); 257c=call("foof",a,2,"d",b,3,"d",m,4,"i",n,5,"i","out",[m,n],1,"d");
254 ]]></programlisting> 258 </programlisting>
255 </refsection> 259 </refsection>
256 260
257 <refsection> 261 <refsection>