Skip to content
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.

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

fix issues for compiling on a new machine #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@
*.exe
*.out
*.app

# Image Files
*.xpm
*.gif
frames.js
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $(ALGO).gif: dkp.exe
./dkp.exe data/dkp.log-big > frames.js
rm -f $(ALGO).gif
convert -loop 1 -delay 3 *.xpm $(ALGO).gif
mkdir raw -p
mv -f *.xpm raw

dkp.exe: Makefile dkp.cc
Expand Down
8 changes: 4 additions & 4 deletions dkp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ class ForwardingAddress: public Obj {
};

struct MemInfo {
static uint time;
static unsigned int time;

bool is_allocated;
bool is_overhead;
uint last_write;
uint last_read;
unsigned int last_write;
unsigned int last_read;

MemInfo() {
is_allocated = false;
Expand Down Expand Up @@ -568,7 +568,7 @@ class Mem {
}
};

uint MemInfo::time = 0;
unsigned int MemInfo::time = 0;
UWd Mem::heap[HeapSize];
MemInfo Mem::info[HeapSize];
Loc Mem::top = 0;
Expand Down