summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjofret2010-04-08 07:55:58 +0000
committerjofret2010-04-08 07:55:58 +0000
commit79547bb0423190526c0a7e70bb0374b4c3ce2a98 (patch)
treeb90249aac9716683a98e6708fd9cbdda32582c4e
parent9961f0099d707a64c19cf32becd3f4786e39d034 (diff)
downloadscilab2c-79547bb0423190526c0a7e70bb0374b4c3ce2a98.tar.gz
scilab2c-79547bb0423190526c0a7e70bb0374b4c3ce2a98.tar.bz2
scilab2c-79547bb0423190526c0a7e70bb0374b4c3ce2a98.zip
Change malloc.h -> stdlib.h
-rw-r--r--src/c/matrixOperations/chol/cchola.c3
-rw-r--r--src/c/matrixOperations/chol/schola.c4
-rw-r--r--src/c/matrixOperations/chol/testDoubleChol.c4
-rw-r--r--src/c/matrixOperations/chol/zchola.c3
-rw-r--r--src/c/matrixOperations/determ/cdeterma.c3
-rw-r--r--src/c/matrixOperations/determ/ddeterma.c5
-rw-r--r--src/c/matrixOperations/determ/sdeterma.c4
-rw-r--r--src/c/matrixOperations/dist/cdista.c4
-rw-r--r--src/c/matrixOperations/dist/zdista.c4
-rw-r--r--src/c/matrixOperations/logm/clogma.c4
-rw-r--r--src/c/matrixOperations/logm/dlogma.c3
-rw-r--r--src/c/matrixOperations/logm/slogma.c3
-rw-r--r--src/c/matrixOperations/logm/testDoubleLogm.c2
-rw-r--r--src/c/matrixOperations/logm/zlogma.c3
-rw-r--r--src/c/matrixOperations/powm/cpowma.c3
-rw-r--r--src/c/matrixOperations/powm/dpowma.c4
-rw-r--r--src/c/matrixOperations/powm/spowma.c3
-rw-r--r--src/c/matrixOperations/powm/zpowma.c3
-rw-r--r--src/c/matrixOperations/spec/dspeca.c4
-rw-r--r--src/c/matrixOperations/spec/zspeca.c4
-rw-r--r--src/c/matrixOperations/spec2/dspec2a.c4
-rw-r--r--src/c/matrixOperations/spec2/zspec2a.c3
22 files changed, 30 insertions, 47 deletions
diff --git a/src/c/matrixOperations/chol/cchola.c b/src/c/matrixOperations/chol/cchola.c
index ab576515..4b657e6c 100644
--- a/src/c/matrixOperations/chol/cchola.c
+++ b/src/c/matrixOperations/chol/cchola.c
@@ -10,8 +10,7 @@
*
*/
-#include <malloc.h>
-#include <stdio.h>
+#include <stdlib.h>
#ifndef WITHOUT_LAPACK
#include "lapack.h"
diff --git a/src/c/matrixOperations/chol/schola.c b/src/c/matrixOperations/chol/schola.c
index 33d01066..cb394c35 100644
--- a/src/c/matrixOperations/chol/schola.c
+++ b/src/c/matrixOperations/chol/schola.c
@@ -10,15 +10,13 @@
*
*/
-
+#include <stdlib.h>
#ifndef WITHOUT_LAPACK
#include "lapack.h"
#else
#include "sqrt.h"
#endif
#include "chol.h"
-#include <malloc.h>
-#include <stdio.h>
void schola(float * in, int size, float *out){
/* param in : input matrix (square matrix)
diff --git a/src/c/matrixOperations/chol/testDoubleChol.c b/src/c/matrixOperations/chol/testDoubleChol.c
index bccddb6a..e4725419 100644
--- a/src/c/matrixOperations/chol/testDoubleChol.c
+++ b/src/c/matrixOperations/chol/testDoubleChol.c
@@ -11,11 +11,11 @@
*/
+#include <math.h>
+#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
#include "chol.h"
-#include <math.h>
-#include <malloc.h>
/* FIXME : assert à 1e-14 pour une valeur d'entrée de 0.003... */
diff --git a/src/c/matrixOperations/chol/zchola.c b/src/c/matrixOperations/chol/zchola.c
index 83661dc5..730c2415 100644
--- a/src/c/matrixOperations/chol/zchola.c
+++ b/src/c/matrixOperations/chol/zchola.c
@@ -10,6 +10,7 @@
*
*/
+#include <stdlib.h>
#ifndef WITHOUT_LAPACK
#include "lapack.h"
#else
@@ -20,8 +21,6 @@
#endif
#include "chol.h"
-#include <malloc.h>
-#include <stdio.h>
void zchola(doubleComplex * in, int size, doubleComplex *out){
/* param in : input matrix (square matrix)
diff --git a/src/c/matrixOperations/determ/cdeterma.c b/src/c/matrixOperations/determ/cdeterma.c
index 448da1b0..6f2d1e8f 100644
--- a/src/c/matrixOperations/determ/cdeterma.c
+++ b/src/c/matrixOperations/determ/cdeterma.c
@@ -10,6 +10,7 @@
*
*/
+#include <stdlib.h>
#ifndef WITHOUT_LAPACK
#include "lapack.h"
#else
@@ -20,7 +21,7 @@
#include "multiplication.h"
#include "subtraction.h"
#include "addition.h"
-#include <malloc.h>
+
floatComplex cdeterma(floatComplex *in, int size){
diff --git a/src/c/matrixOperations/determ/ddeterma.c b/src/c/matrixOperations/determ/ddeterma.c
index 4f8046bb..6894a365 100644
--- a/src/c/matrixOperations/determ/ddeterma.c
+++ b/src/c/matrixOperations/determ/ddeterma.c
@@ -10,15 +10,12 @@
*
*/
-
+#include <stdlib.h>
#ifndef WITHOUT_LAPACK
#include "lapack.h"
#endif
#include "determ.h"
-#include <malloc.h>
#include "lapack.h"
-#include <stdio.h>
-
double ddeterma(double * in, int size){
#ifndef WITHOUT_LAPACK
diff --git a/src/c/matrixOperations/determ/sdeterma.c b/src/c/matrixOperations/determ/sdeterma.c
index d7f31ab0..dbe36c90 100644
--- a/src/c/matrixOperations/determ/sdeterma.c
+++ b/src/c/matrixOperations/determ/sdeterma.c
@@ -10,13 +10,11 @@
*
*/
-
+#include <stdlib.h>
#ifndef WITHOUT_LAPACK
#include "lapack.h"
#endif
#include "determ.h"
-#include <malloc.h>
-#include <stdio.h>
float sdeterma(float * in, int size){
#ifndef WITHOUT_LAPACK
diff --git a/src/c/matrixOperations/dist/cdista.c b/src/c/matrixOperations/dist/cdista.c
index ca0b45f1..f9ffd17b 100644
--- a/src/c/matrixOperations/dist/cdista.c
+++ b/src/c/matrixOperations/dist/cdista.c
@@ -9,7 +9,8 @@
* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
*
*/
-#include <malloc.h>
+
+#include <stdlib.h>
#include "dist.h"
#include "matrixTranspose.h"
#include "matrixMultiplication.h"
@@ -17,7 +18,6 @@
#include "sqrt.h"
#include "conj.h"
#include "subtraction.h"
-#include "stdio.h"
float cdista(floatComplex* in1,floatComplex* in2, int lines, int columns){
int i=0;
diff --git a/src/c/matrixOperations/dist/zdista.c b/src/c/matrixOperations/dist/zdista.c
index b2ecd49f..72afa184 100644
--- a/src/c/matrixOperations/dist/zdista.c
+++ b/src/c/matrixOperations/dist/zdista.c
@@ -9,7 +9,8 @@
* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
*
*/
-#include <malloc.h>
+
+#include <stdlib.h>
#include "dist.h"
#include "matrixTranspose.h"
#include "matrixMultiplication.h"
@@ -17,7 +18,6 @@
#include "sqrt.h"
#include "conj.h"
#include "subtraction.h"
-#include "stdio.h"
double zdista(doubleComplex* in1,doubleComplex* in2, int lines, int columns){
int i=0;
diff --git a/src/c/matrixOperations/logm/clogma.c b/src/c/matrixOperations/logm/clogma.c
index a5e253fb..16c1bb4b 100644
--- a/src/c/matrixOperations/logm/clogma.c
+++ b/src/c/matrixOperations/logm/clogma.c
@@ -10,11 +10,9 @@
*
*/
-
-#include <malloc.h>
+#include <stdlib.h>
#include "logm.h"
-
void clogma (floatComplex* in, int rows, floatComplex* out){
doubleComplex *inCopy, *outCopy;
int i=0;
diff --git a/src/c/matrixOperations/logm/dlogma.c b/src/c/matrixOperations/logm/dlogma.c
index d38af5d0..2184c377 100644
--- a/src/c/matrixOperations/logm/dlogma.c
+++ b/src/c/matrixOperations/logm/dlogma.c
@@ -10,10 +10,9 @@
*
*/
-#include <malloc.h>
+#include <stdlib.h>
#include "logm.h"
-
void dlogma (double* in, int rows, double* out){
doubleComplex *inCpx,*outCpx;
int i;
diff --git a/src/c/matrixOperations/logm/slogma.c b/src/c/matrixOperations/logm/slogma.c
index bffc2dfd..8b3120df 100644
--- a/src/c/matrixOperations/logm/slogma.c
+++ b/src/c/matrixOperations/logm/slogma.c
@@ -10,10 +10,9 @@
*
*/
-#include <malloc.h>
+#include <stdlib.h>
#include "logm.h"
-
void slogma (float* in, int rows, float* out){
doubleComplex *inCpx, *outCopy;
int i;
diff --git a/src/c/matrixOperations/logm/testDoubleLogm.c b/src/c/matrixOperations/logm/testDoubleLogm.c
index 0c326f57..039c6e81 100644
--- a/src/c/matrixOperations/logm/testDoubleLogm.c
+++ b/src/c/matrixOperations/logm/testDoubleLogm.c
@@ -10,7 +10,7 @@
*
*/
-#include <malloc.h>
+#include <stdlib.h>
#include <assert.h>
#include <math.h>
#include <stdio.h>
diff --git a/src/c/matrixOperations/logm/zlogma.c b/src/c/matrixOperations/logm/zlogma.c
index 92441bf7..3fb7b274 100644
--- a/src/c/matrixOperations/logm/zlogma.c
+++ b/src/c/matrixOperations/logm/zlogma.c
@@ -10,8 +10,7 @@
*
*/
-#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "lapack.h"
#include "logm.h"
#include "log.h"
diff --git a/src/c/matrixOperations/powm/cpowma.c b/src/c/matrixOperations/powm/cpowma.c
index 04a393a9..d023a7aa 100644
--- a/src/c/matrixOperations/powm/cpowma.c
+++ b/src/c/matrixOperations/powm/cpowma.c
@@ -9,7 +9,8 @@
* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
*
*/
-#include <malloc.h>
+
+#include <stdlib.h>
#include "matrixPow.h"
#include "spec.h"
#include "pow.h"
diff --git a/src/c/matrixOperations/powm/dpowma.c b/src/c/matrixOperations/powm/dpowma.c
index 6b12a8f3..b38f9735 100644
--- a/src/c/matrixOperations/powm/dpowma.c
+++ b/src/c/matrixOperations/powm/dpowma.c
@@ -9,7 +9,8 @@
* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
*
*/
-#include <malloc.h>
+
+#include <stdlib.h>
#include "matrixPow.h"
#include "spec.h"
#include "pow.h"
@@ -18,7 +19,6 @@
#include "zeros.h"
#include "matrixInversion.h"
#include "matrixMultiplication.h"
-#include <stdio.h>
void dpowma(double* in, int rows, double power, double* out){
int i=0, j=0;
diff --git a/src/c/matrixOperations/powm/spowma.c b/src/c/matrixOperations/powm/spowma.c
index 47205ab5..b416656a 100644
--- a/src/c/matrixOperations/powm/spowma.c
+++ b/src/c/matrixOperations/powm/spowma.c
@@ -9,7 +9,8 @@
* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
*
*/
-#include <malloc.h>
+
+#include <stdlib.h>
#include "matrixPow.h"
#include "spec.h"
#include "pow.h"
diff --git a/src/c/matrixOperations/powm/zpowma.c b/src/c/matrixOperations/powm/zpowma.c
index b9ccc7cc..0de56475 100644
--- a/src/c/matrixOperations/powm/zpowma.c
+++ b/src/c/matrixOperations/powm/zpowma.c
@@ -9,7 +9,8 @@
* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
*
*/
-#include <malloc.h>
+
+#include <stdlib.h>
#include "matrixPow.h"
#include "spec.h"
#include "pow.h"
diff --git a/src/c/matrixOperations/spec/dspeca.c b/src/c/matrixOperations/spec/dspeca.c
index 778297bb..1131ecf2 100644
--- a/src/c/matrixOperations/spec/dspeca.c
+++ b/src/c/matrixOperations/spec/dspeca.c
@@ -10,13 +10,11 @@
*
*/
-#include <malloc.h>
+#include <stdlib.h>
#include "spec.h"
#include "lapack.h"
#include "zeros.h"
#include "max.h"
-#include "stdio.h"
-
void dspeca(double* in, int rows,double* out){
int i=0, j=0;
diff --git a/src/c/matrixOperations/spec/zspeca.c b/src/c/matrixOperations/spec/zspeca.c
index fffe3e16..a2b1c25a 100644
--- a/src/c/matrixOperations/spec/zspeca.c
+++ b/src/c/matrixOperations/spec/zspeca.c
@@ -10,14 +10,12 @@
*
*/
-#include <malloc.h>
-#include <stdio.h>
+#include <stdlib.h>
#include "spec.h"
#include "lapack.h"
#include "zeros.h"
#include "conj.h"
-
void zspeca(doubleComplex* in, int rows,doubleComplex* out){
int i = 0, j = 0;
int hermitian = 0;
diff --git a/src/c/matrixOperations/spec2/dspec2a.c b/src/c/matrixOperations/spec2/dspec2a.c
index f1db6eca..98b2c5ad 100644
--- a/src/c/matrixOperations/spec2/dspec2a.c
+++ b/src/c/matrixOperations/spec2/dspec2a.c
@@ -10,13 +10,11 @@
*
*/
-#include <malloc.h>
+#include <stdlib.h>
#include "spec.h"
#include "lapack.h"
#include "zeros.h"
#include "max.h"
-#include "stdio.h"
-
void dspec2a(double* in, int rows,double* eigenvalues,double* eigenvectors){
int i=0, j=0, ij=0, ij1=0;
diff --git a/src/c/matrixOperations/spec2/zspec2a.c b/src/c/matrixOperations/spec2/zspec2a.c
index 37d99990..e33ed897 100644
--- a/src/c/matrixOperations/spec2/zspec2a.c
+++ b/src/c/matrixOperations/spec2/zspec2a.c
@@ -10,14 +10,13 @@
*
*/
-#include <malloc.h>
+#include <stdlib.h>
#include "spec.h"
#include "lapack.h"
#include "zeros.h"
#include "stdio.h"
#include "conj.h"
-
void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues, doubleComplex* eigenvectors){
int i = 0, j = 0;
int hermitian = 0;