From 80d123cd94a1f38b5938dbf7fb0124f870b7079b Mon Sep 17 00:00:00 2001 From: Laurent Saboret Date: Thu, 7 Jun 2007 14:10:24 +0000 Subject: [PATCH] Fixed bug found by kevin.kai.xu@gmail.com (redefinitions of _cgal_taucs_available_memory_size) by declaring all functions inline. --- Surface_mesh_parameterization/include/CGAL/Taucs_fix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h b/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h index c5870a63c82..b439f8b64a8 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_fix.h @@ -77,7 +77,7 @@ extern "C" /* Redirect call to avoid link error */ #define taucs_system_memory_size cgal_taucs_system_memory_size -double taucs_system_memory_size() +inline double taucs_system_memory_size() { /* LS 2006: The original code below is buggy on Linux 2.6 */ /* (because /proc/meminfo format changed) */ @@ -118,7 +118,7 @@ double taucs_system_memory_size() /* Redirect call to avoid link error */ #define taucs_system_memory_size cgal_taucs_system_memory_size -double taucs_system_memory_size() +inline double taucs_system_memory_size() { double m_sc; m_sc = (double) 4096; /* page size */ @@ -143,7 +143,7 @@ double taucs_system_memory_size() /* LS 2007: if m_sys is meaningful, then we limit malloc test by 0.75*m_sys */ #define limit_memory(mem) ((mem) < m_max ? (mem) : m_max) -double taucs_available_memory_size() +inline double taucs_available_memory_size() { /* LS 2007: The original code below creates an infinite loop on Linux */ /* (optimistic memory allocation => malloc() never returns NULL) */