Skip to content

Misc fixes to compile on Ubuntu 15.10 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
giraldeau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Misc fixes to compile on Ubuntu 15.10 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dcache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
};

Expand Down
2 changes: 2 additions & 0 deletions klibc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions mathlib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,15 @@ 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,
FP_ZERO,
FP_SUBNORMAL,
FP_NORMAL
};
*/

#undef isinf
inline int isinf(double x) {
Expand Down