X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fparse.c;h=1edfe1849a8e1430ceaacf07d901bc07bca6943b;hb=7ff2233608f1f110e112ae576fa829618ce181ae;hp=b4218e51fa9b030d1f2802b1b8394f893d202420;hpb=bd455348d39bee562296741689882dcb97c46ba3;p=sbcl.git diff --git a/src/runtime/parse.c b/src/runtime/parse.c index b4218e5..1edfe18 100644 --- a/src/runtime/parse.c +++ b/src/runtime/parse.c @@ -14,9 +14,13 @@ #include #include #include -#include #include "sbcl.h" +#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD) +#include "pthreads_win32.h" +#else +#include +#endif #include "runtime.h" #if defined(LISP_FEATURE_SB_LDB) @@ -32,6 +36,7 @@ #include "arch.h" #include "search.h" #include "thread.h" +#include "pseudo-atomic.h" #include "genesis/simple-fun.h" #include "genesis/fdefn.h" @@ -44,10 +49,10 @@ static void skip_ws(char **ptr) (*ptr)++; } -static boolean string_to_long(char *token, long *value) +static boolean string_to_long(char *token, uword_t *value) { int base, digit; - long num; + uword_t num; char *ptr; if (token == 0) @@ -191,11 +196,11 @@ char *token; } #endif -long parse_number(ptr) +uword_t parse_number(ptr) char **ptr; { char *token = parse_token(ptr); - long result; + uword_t result; if (token == NULL) { printf("expected a number\n"); @@ -228,7 +233,7 @@ char **ptr; result &= ~7; } else { - long value; + uword_t value; if (!string_to_long(token, &value)) { printf("invalid number: ``%s''\n", token); throw_to_monitor(); @@ -311,9 +316,9 @@ char **ptr; { struct thread *thread=arch_os_get_current_thread(); char *token = parse_token(ptr); - long pointer; + uword_t pointer; lispobj result; - long value; + uword_t value; if (token == NULL) { printf("expected an object\n");