From 9906f47e2efe7c113436520c90021eef39751b7e Mon Sep 17 00:00:00 2001
From: torset
Date: Tue, 20 Jan 2009 13:18:25 +0000
Subject: it seems all modifications are ok

---
 src/operations/multiplication/cmuls.c | 27 +++++++++++++++++++++++++--
 src/operations/multiplication/zmuls.c | 26 ++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

(limited to 'src/operations/multiplication')

diff --git a/src/operations/multiplication/cmuls.c b/src/operations/multiplication/cmuls.c
index a205427f..817f3771 100644
--- a/src/operations/multiplication/cmuls.c
+++ b/src/operations/multiplication/cmuls.c
@@ -11,8 +11,31 @@
  */
 
 
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+
+#include "floatComplex.h"
 #include "multiplication.h"
 
-floatComplex cmuls(floatComplex in1, floatComplex in2){
-	return ctimess(in1,in2);
+
+
+/*
+** \function cmuls
+** \brief Multiply 2 Complex numbers.
+*/
+floatComplex cmuls(floatComplex z1, floatComplex z2) {
+#ifndef STDC99
+  return FloatComplex(z1.real*z2.real - z1.imag*z2.imag,
+		      z1.real*z2.imag + z2.real*z1.imag);
+#else
+  return z1 * z2;
+#endif
 }
diff --git a/src/operations/multiplication/zmuls.c b/src/operations/multiplication/zmuls.c
index fbd14f8d..eacbc135 100644
--- a/src/operations/multiplication/zmuls.c
+++ b/src/operations/multiplication/zmuls.c
@@ -11,8 +11,30 @@
  */
 
 
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+
+#include "doubleComplex.h"
 #include "multiplication.h"
 
-doubleComplex zmuls(doubleComplex in1, doubleComplex in2){
-	return ztimess(in1,in2);
+
+/*
+** \function zmuls
+** \brief Multiply 2 Complex numbers.
+*/
+doubleComplex zmuls(doubleComplex z1, doubleComplex z2) {
+#ifndef STDC99
+  return DoubleComplex(z1.real*z2.real - z1.imag*z2.imag,
+		       z1.real*z2.imag + z2.real*z1.imag);
+#else
+  return z1 * z2;
+#endif
 }
-- 
cgit