You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

60 lines
1.5 KiB

diff -Naur mico.orig/Makefile mico/Makefile
--- mico.orig/Makefile Fri Feb 14 11:55:53 2003
+++ mico/Makefile Fri Feb 14 14:15:35 2003
@@ -72,7 +72,7 @@
$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
fi
- -ldconfig
+# -ldconfig
install-cd:
for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
diff -Naur mico.orig/include/mico/os-math.h mico/include/mico/os-math.h
--- mico.orig/include/mico/os-math.h 2003-05-26 12:55:46.000000000 +0200
+++ mico/include/mico/os-math.h 2003-07-01 12:00:36.000000000 +0200
@@ -279,11 +279,7 @@
#include <unistd.h>
#include <signal.h>
#include <sys/types.h>
-
-#if !defined(__GNUG__) || !defined(__sgi)
-// conflict for initstate ()
-#include <math.h>
-#endif
+#include <cmath>
#ifdef HAVE_FLOAT_H
#include <float.h>
@@ -343,6 +339,7 @@
static MICO_Boolean is_infinity (MICO_Double d)
{
+ using namespace std;
#if defined(HAVE_ISINF)
return isinf (d);
#elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
@@ -354,6 +351,7 @@
static MICO_Boolean is_nan (MICO_Double d)
{
+ using namespace std;
#if defined(HAVE_ISNAN)
return isnan (d);
#else
@@ -402,6 +400,7 @@
static MICO_Boolean is_infinityl (MICO_LongDouble d)
{
+ using namespace std;
#if defined(HAVE_ISINFL)
return isinfl (d);
#elif defined(HAVE_ISINF)
@@ -413,6 +412,7 @@
static MICO_Boolean is_nanl (MICO_LongDouble d)
{
+ using namespace std;
#if defined(HAVE_ISNANL)
return isnanl (d);
#elif defined(HAVE_ISNAN)