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

db4
Slava Pestov 2008-11-18 20:36:04 -06:00
commit d441f90122
2 changed files with 8 additions and 7 deletions

2
vm/main-windows-nt.c Normal file → Executable file
View File

@ -15,7 +15,7 @@ int WINAPI WinMain(
szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs); szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
if(NULL == szArglist) if(NULL == szArglist)
{ {
print_string("CommandLineToArgvW failed\n"); puts("CommandLineToArgvW failed");
return 1; return 1;
} }

View File

@ -20,13 +20,14 @@ typedef wchar_t F_CHAR;
#define STRNCMP wcsncmp #define STRNCMP wcsncmp
#define STRDUP _wcsdup #define STRDUP _wcsdup
#define CELL_FORMAT "%Iu" #ifdef WIN64
#define CELL_HEX_FORMAT "%Ix" #define CELL_FORMAT "%Iu"
#define CELL_HEX_FORMAT "%Ix"
#ifdef FACTOR_64
#define CELL_HEX_PAD_FORMAT "%016Ix" #define CELL_HEX_PAD_FORMAT "%016Ix"
#else #else
#define CELL_HEX_PAD_FORMAT "%08Ix" #define CELL_FORMAT "%lu"
#define CELL_HEX_FORMAT "%lx"
#define CELL_HEX_PAD_FORMAT "%08lx"
#endif #endif
#define FIXNUM_FORMAT "%Id" #define FIXNUM_FORMAT "%Id"
@ -34,7 +35,7 @@ typedef wchar_t F_CHAR;
#define OPEN_READ(path) _wfopen(path,L"rb") #define OPEN_READ(path) _wfopen(path,L"rb")
#define OPEN_WRITE(path) _wfopen(path,L"wb") #define OPEN_WRITE(path) _wfopen(path,L"wb")
#define print_native_string(string) wprintf(L"%s",arg) #define print_native_string(string) wprintf(L"%s",string)
/* Difference between Jan 1 00:00:00 1601 and Jan 1 00:00:00 1970 */ /* Difference between Jan 1 00:00:00 1601 and Jan 1 00:00:00 1970 */
#define EPOCH_OFFSET 0x019db1ded53e8000LL #define EPOCH_OFFSET 0x019db1ded53e8000LL