From 300182ffd9678ba70f3ff6ded95762bab11ccb0c Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Sun, 10 May 2020 10:23:26 +0200 Subject: [PATCH] rect --- src/rect.cpp | 22 +++++++++++----------- src/rect.h | 8 ++------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/rect.cpp b/src/rect.cpp index 9da526b..892afc8 100644 --- a/src/rect.cpp +++ b/src/rect.cpp @@ -23,16 +23,16 @@ #include #include "rect.h" -extern "C" { - - irr::core::rect - scm_to_rect_s32 (SCM rect) - { - return irr::core::rect - (scm_to_int32 (scm_car (rect)), - scm_to_int32 (scm_cadr (rect)), - scm_to_int32 (scm_caddr (rect)), - scm_to_int32 (scm_cadddr (rect))); - } +using namespace irr; + + +core::rect +scm_to_rect_s32 (SCM rect) +{ + return core::rect + (scm_to_int32 (scm_car (rect)), + scm_to_int32 (scm_cadr (rect)), + scm_to_int32 (scm_caddr (rect)), + scm_to_int32 (scm_cadddr (rect))); } diff --git a/src/rect.h b/src/rect.h index 4e015a1..313965e 100644 --- a/src/rect.h +++ b/src/rect.h @@ -25,11 +25,7 @@ #include #include -extern "C" { - - irr::core::rect - scm_to_rect_s32 (SCM rect); - -} +irr::core::rect +scm_to_rect_s32 (SCM rect); #endif -- 2.39.2