More VM cleanups

diff --git a/vm/layouts.hpp b/vm/layouts.hpp
index f8672e452287c96ced4dea1c1a075ee0797030ba..3fe89cb5582dbf2a643d7fa6509534c72e88d5e4 100755 (executable)
--- a/vm/layouts.hpp
+++ b/vm/layouts.hpp
@@ -90,7 +90,7 @@ inline static cell tag_for(cell type)
        return type < HEADER_TYPE ? type : OBJECT_TYPE;
 }
 
-class object;
+struct object;
 
 struct header {
        cell value;

diff --git a/vm/master.hpp b/vm/master.hpp
index 6164c9ea308bdcc029eae59c741c2072edf5b9d2..83f0920f5b81046e0b2bfa3bfc64755380a228c1 100755 (executable)
--- a/vm/master.hpp
+++ b/vm/master.hpp
@@ -19,8 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
-#include <sys/param.h>
 
 /* C++ headers */
 #if __GNUC__ == 4

diff --git a/vm/os-unix.hpp b/vm/os-unix.hpp
index 07ec385763f0e388b160842840a066e131a9e38e..8aff18364e18bdefb5f0ac73bea5c82bc5022922 100755 (executable)
--- a/vm/os-unix.hpp
+++ b/vm/os-unix.hpp
@@ -1,3 +1,5 @@
+#include <unistd.h>
+#include <sys/param.h>
 #include <dirent.h>
 #include <sys/mman.h>
 #include <sys/types.h>
@@ -24,13 +26,13 @@ typedef char symbol_char;
 #define FSEEK fseeko
 
 #define FIXNUM_FORMAT "%ld"
-#define cell_FORMAT "%lu"
-#define cell_HEX_FORMAT "%lx"
+#define CELL_FORMAT "%lu"
+#define CELL_HEX_FORMAT "%lx"
 
 #ifdef FACTOR_64
-       #define cell_HEX_PAD_FORMAT "%016lx"
+       #define CELL_HEX_PAD_FORMAT "%016lx"
 #else
-       #define cell_HEX_PAD_FORMAT "%08lx"
+       #define CELL_HEX_PAD_FORMAT "%08lx"
 #endif
 
 #define FIXNUM_FORMAT "%ld"

diff --git a/vm/os-windows.hpp b/vm/os-windows.hpp
index 5422216593deb960b8d6eff60e43603930557504..27e27752890c092d20957212b48db349c748f455 100755 (executable)
--- a/vm/os-windows.hpp
+++ b/vm/os-windows.hpp
@@ -22,14 +22,14 @@ typedef wchar_t vm_char;
 #define FSEEK fseek
 
 #ifdef WIN64
-       #define cell_FORMAT "%Iu"
-       #define cell_HEX_FORMAT "%Ix"
-       #define cell_HEX_PAD_FORMAT "%016Ix"
+       #define CELL_FORMAT "%Iu"
+       #define CELL_HEX_FORMAT "%Ix"
+       #define CELL_HEX_PAD_FORMAT "%016Ix"
        #define FIXNUM_FORMAT "%Id"
 #else
-       #define cell_FORMAT "%lu"
-       #define cell_HEX_FORMAT "%lx"
-       #define cell_HEX_PAD_FORMAT "%08lx"
+       #define CELL_FORMAT "%lu"
+       #define CELL_HEX_FORMAT "%lx"
+       #define CELL_HEX_PAD_FORMAT "%08lx"
        #define FIXNUM_FORMAT "%ld"
 #endif
 

diff --git a/vm/utilities.cpp b/vm/utilities.cpp
index df5c09847d9700ad8e97c40875e75098dd19e945..37fe28948e4971abf73eea49abd080adca081215 100755 (executable)
--- a/vm/utilities.cpp
+++ b/vm/utilities.cpp
@@ -32,17 +32,17 @@ void print_string(const char *str)
 
 void print_cell(cell x)
 {
-       printf(cell_FORMAT,x);
+       printf(CELL_FORMAT,x);
 }
 
 void print_cell_hex(cell x)
 {
-       printf(cell_HEX_FORMAT,x);
+       printf(CELL_HEX_FORMAT,x);
 }
 
 void print_cell_hex_pad(cell x)
 {
-       printf(cell_HEX_PAD_FORMAT,x);
+       printf(CELL_HEX_PAD_FORMAT,x);
 }
 
 void print_fixnum(fixnum x)
@@ -53,7 +53,7 @@ void print_fixnum(fixnum x)
 cell read_cell_hex()
 {
        cell cell;
-       if(scanf(cell_HEX_FORMAT,&cell) < 0) exit(1);
+       if(scanf(CELL_HEX_FORMAT,&cell) < 0) exit(1);
        return cell;
 };