steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
U-SLAVA-DFB8FF805\Slava 2008-12-01 18:20:50 -06:00
parent ef0410ef50 9e4dfda8cd
commit 2fa3787d7b
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/vocabs/loader/loader-docs.factor
View File

@ -66,7 +66,7 @@ HELP: vocab-roots
{ $var-description "A sequence of pathname strings to search for vocabularies." } ; { $var-description "A sequence of pathname strings to search for vocabularies." } ;
HELP: add-vocab-root HELP: add-vocab-root
{ $values { "path" "a pathname string" } } { $values { "root" "a pathname string" } }
{ $description "Adds a directory pathname to the list of vocabulary roots." } { $description "Adds a directory pathname to the list of vocabulary roots." }
{ $see-also "factor-roots" } ; { $see-also "factor-roots" } ;

1
vm/os-unix.h
View File

@ -23,6 +23,7 @@ typedef char F_SYMBOL;
#define STRNCMP strncmp #define STRNCMP strncmp
#define STRDUP strdup #define STRDUP strdup
#define FIXNUM_FORMAT "%ld"
#define CELL_FORMAT "%lu" #define CELL_FORMAT "%lu"
#define CELL_HEX_FORMAT "%lx" #define CELL_HEX_FORMAT "%lx"

8
vm/os-windows.h
View File

@ -20,13 +20,13 @@ typedef wchar_t F_CHAR;
#define STRNCMP wcsncmp #define STRNCMP wcsncmp
#define STRDUP _wcsdup #define STRDUP _wcsdup
#define FIXNUM_FORMAT "%Id"
#define CELL_FORMAT "%lu"
#define CELL_HEX_FORMAT "%Ix"
#ifdef WIN64 #ifdef WIN64
#define CELL_FORMAT "%Iu"
#define CELL_HEX_FORMAT "%Ix"
#define CELL_HEX_PAD_FORMAT "%016Ix" #define CELL_HEX_PAD_FORMAT "%016Ix"
#else #else
#define CELL_FORMAT "%lu"
#define CELL_HEX_FORMAT "%lx"
#define CELL_HEX_PAD_FORMAT "%08lx" #define CELL_HEX_PAD_FORMAT "%08lx"
#endif #endif

2
vm/utilities.c
View File

@ -44,7 +44,7 @@ void print_cell_hex_pad(CELL x)
void print_fixnum(F_FIXNUM x) void print_fixnum(F_FIXNUM x)
{ {
printf(CELL_FORMAT,x); printf(FIXNUM_FORMAT,x);
} }
CELL read_cell_hex(void) CELL read_cell_hex(void)