From 3964dea2046433dd6a15d3f016708311ede48e46 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Thu, 27 Jul 2017 22:07:55 -0400
Subject: [PATCH] remove "matrix~" from iemmatrix to prevent nameclash with
cyclone/matrix~
---
externals/iem/iemmatrix/alias/matrix~.c | 5 -----
externals/iem/iemmatrix/src/mtx_mul~.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
delete mode 100644 externals/iem/iemmatrix/alias/matrix~.c
diff --git a/externals/iem/iemmatrix/alias/matrix~.c b/externals/iem/iemmatrix/alias/matrix~.c
deleted file mode 100644
index b50d1d933..000000000
--- a/externals/iem/iemmatrix/alias/matrix~.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../src/mtx_mul~.c"
-void matrix_tilde_setup()
-{
- mtx_mul_tilde_setup();
-}
diff --git a/externals/iem/iemmatrix/src/mtx_mul~.c b/externals/iem/iemmatrix/src/mtx_mul~.c
index 3f072f35b..64f31edc1 100644
--- a/externals/iem/iemmatrix/src/mtx_mul~.c
+++ b/externals/iem/iemmatrix/src/mtx_mul~.c
@@ -925,7 +925,7 @@ void mtx_mul_tilde_setup(void)
/* compatibility with tm's iem_matrix */
class_addcreator((t_newmethod)matrix_multilde_new, gensym("matrix_mul_line~"), A_GIMME, 0);
/* compatibility with jmz's zexy */
- class_addcreator((t_newmethod)matrix_multilde_new, gensym("matrix~"), A_GIMME, 0);
+ //class_addcreator((t_newmethod)matrix_multilde_new, gensym("matrix~"), A_GIMME, 0);
class_addmethod(matrix_multilde_class, (t_method)matrix_multilde_dsp, gensym("dsp"), 0);
--
GitLab