From 06d3579030a681c3b1f833c5e586a02937929434 Mon Sep 17 00:00:00 2001
From: jofret
Date: Fri, 5 Jun 2009 05:47:59 +0000
Subject: Gather constant information

---
 includes/constant.h                    | 11 +++++++++++
 macros/CFiles/sci2cincludes/constant.h | 27 ---------------------------
 2 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 macros/CFiles/sci2cincludes/constant.h

diff --git a/includes/constant.h b/includes/constant.h
index a2c0d499..e03d9961 100644
--- a/includes/constant.h
+++ b/includes/constant.h
@@ -13,8 +13,19 @@
 #ifndef __CONSTANT_H__
 #define __CONSTANT_H__
 
+#include <math.h>
+
 #define FPI 3.1415926535897931159980f
 #define DPI 3.1415926535897931159980
 
+#define PI DPI
+#define SCI2C_PI DPI
+#define SCI2C_T 1
+#define SCI2C_F 0
+#define SCI2C_NAN nan("")
+#define SCI2C_INF 1e100000
+#define SCI2C_IMG_C FloatComplex(0,1)
+#define SCI2C_IMG_Z DoubleComplex(0,1)
+
 #endif /* !__CONSTANT_H__ */
 
diff --git a/macros/CFiles/sci2cincludes/constant.h b/macros/CFiles/sci2cincludes/constant.h
deleted file mode 100644
index 9eb49544..00000000
--- a/macros/CFiles/sci2cincludes/constant.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-**  -*- C -*-
-**
-** constant.h
-** Made by  Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on  Fri Mar 30 12:03:14 2007 jofret
-** Last update Mon Oct 22 17:23:08 2007 bruno
-**
-** Copyright INRIA 2007
-*/
-
-#ifndef __CONSTANT_H__
-#define __CONSTANT_H__
-
-#include <math.h>
-#define PI 3.1415826535
-#define SCI2C_PI 3.1415826535
-#define SCI2C_T 1
-#define SCI2C_F 0
-#define SCI2C_NAN nan("")
-#define SCI2C_INF 1e100000
-#define SCI2C_IMG_C FloatComplex(0,1)
-#define SCI2C_IMG_Z DoubleComplex(0,1)
-
-#endif /* !__CONSTANT_H__ */
-
-- 
cgit