From 604147fda3d28051b80676f82377fb61371f3b78 Mon Sep 17 00:00:00 2001
From: Francis Giraldeau <francis.giraldeau@gmail.com>
Date: Tue, 16 Feb 2016 17:15:56 -0500
Subject: [PATCH] Misc fixes to compile on Ubuntu 15.10

* Fix redefinition error in ctype.h
* Fix conflicting enum in math.h
* Fix call to FullyAssociativeTagsNbitOneHot::invalidate()

Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com>
---
 dcache.h  | 2 +-
 klibc.cpp | 2 ++
 mathlib.h | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dcache.h b/dcache.h
index 4b5631c..47b8e2f 100644
--- a/dcache.h
+++ b/dcache.h
@@ -446,7 +446,7 @@ namespace CacheSubsystem {
     }
 
     int flush_virt(Waddr virtaddr, W64 threadid) {
-      return invalidate(tagof(virtaddr, threadid));
+      return base_t::invalidate(tagof(virtaddr, threadid));
     }
   };
 
diff --git a/klibc.cpp b/klibc.cpp
index b011395..82fa0cd 100644
--- a/klibc.cpp
+++ b/klibc.cpp
@@ -9,6 +9,8 @@
 // GNU General Public License, Version 2.
 //
 
+// required to avoid redefinition of inline functions
+#define __NO_CTYPE
 #include <globals.h>
 #include <superstl.h>
 #include <stdarg.h>
diff --git a/mathlib.h b/mathlib.h
index 1c6f58b..61f0f70 100644
--- a/mathlib.h
+++ b/mathlib.h
@@ -75,6 +75,7 @@ namespace math {
   }
 
   /* All floating-point numbers can be put in one of these categories.  */
+  /* FIXME: these definitions conflicts with defines in math.h
   enum {
     FP_NAN,
     FP_INFINITE,
@@ -82,6 +83,7 @@ namespace math {
     FP_SUBNORMAL,
     FP_NORMAL
   };
+  */
 
 #undef isinf
   inline int isinf(double x) {