summaryrefslogtreecommitdiff
path: root/2.3-1/includes/lapack.h
diff options
context:
space:
mode:
authorBrijeshcr2017-07-07 18:19:45 +0530
committerGitHub2017-07-07 18:19:45 +0530
commit5258fe20f21514eca1f7dc4ee384fe63c35c68a1 (patch)
treec0424024c16aa122a5a38686dfed75a4c4866e95 /2.3-1/includes/lapack.h
parent8d1da9568248c9a0572da08a7039e75e84d782b0 (diff)
parenta505550d38b2b886c61863a85be67faf02ad604b (diff)
downloadScilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.gz
Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.bz2
Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.zip
Merge pull request #12 from yash1112/master
SCi2cDeps updated, Windows compatibility resolved
Diffstat (limited to '2.3-1/includes/lapack.h')
-rw-r--r--2.3-1/includes/lapack.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/2.3-1/includes/lapack.h b/2.3-1/includes/lapack.h
index d3f6cb32..c5e4e680 100644
--- a/2.3-1/includes/lapack.h
+++ b/2.3-1/includes/lapack.h
@@ -186,6 +186,7 @@ extern int dggbal_(char*,int*,double*,int*,double*,int*,int*,int*,double*, \
double*,double*,int*);
extern int dgebak_(char*,char*,int*,int*,int*,double*,int*,double*,int*,int*);
+<<<<<<< HEAD
/*Used in SVD */
extern double dgesvd_(char*,char*,int*,int*,double*,int*,double*,double*,int*,\
double*,int*,double *,int*,int*);