color

diff --git a/src/color.cpp b/src/color.cpp
index 63448b334eff560dde1093bfe0761a76ebf1a20d..d21704d5070dec8790e8e68b1e08bc6734da256e 100644 (file)
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -23,25 +23,23 @@
 #include <libguile.h>
 #include "color.h"
 
-extern "C" {
-
-  SCM
-  scm_from_color (irr::video::SColor color)
-  {
-    return scm_list_4 (scm_from_uint32 (color.getAlpha ()),
-                       scm_from_uint32 (color.getRed ()),
-                       scm_from_uint32 (color.getGreen ()),
-                       scm_from_uint32 (color.getBlue ()));
-  }
-
-  irr::video::SColor
-  scm_to_color (SCM color)
-  {
-    return irr::video::SColor
-      (scm_to_uint32 (scm_car (color)),
-       scm_to_uint32 (scm_cadr (color)),
-       scm_to_uint32 (scm_caddr (color)),
-       scm_to_uint32 (scm_cadddr (color)));
-  }
 
+SCM
+scm_from_color (irr::video::SColor color)
+{
+  return scm_list_4 (scm_from_uint32 (color.getAlpha ()),
+                     scm_from_uint32 (color.getRed ()),
+                     scm_from_uint32 (color.getGreen ()),
+                     scm_from_uint32 (color.getBlue ()));
+}
+
+
+irr::video::SColor
+scm_to_color (SCM color)
+{
+  return irr::video::SColor
+    (scm_to_uint32 (scm_car (color)),
+     scm_to_uint32 (scm_cadr (color)),
+     scm_to_uint32 (scm_caddr (color)),
+     scm_to_uint32 (scm_cadddr (color)));
 }

diff --git a/src/color.h b/src/color.h
index 3dbbfe94ec5e3c436217d2be1bfef5694db94384..bab6a93a5f424608c9d2a993f732519b6cfc5e70 100644 (file)
--- a/src/color.h
+++ b/src/color.h
@@ -25,14 +25,10 @@
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
 
-extern "C" {
+SCM
+scm_from_color (irr::video::SColor color);
 
-  SCM
-  scm_from_color (irr::video::SColor color);
-
-  irr::video::SColor
-  scm_to_color (SCM color);
-
-}
+irr::video::SColor
+scm_to_color (SCM color);
 
 #endif