mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-06-03 23:24:13 +00:00
Code Issues 1 Releases Wiki Activity

Fix MSVC Warnings.

Browse Source
This commit is contained in:
Calvin Rose 2020-06-14 14:20:38 -05:00
parent fbe23d8c33
commit 1bddb87a0c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/inttypes.c
View File

@ -206,14 +206,14 @@ static Janet cfun_it_u64_new(int32_t argc, Janet *argv) {
// In the following code explicit casts are sometimes used to help // In the following code explicit casts are sometimes used to help
// make it clear when int/float conversions are happening. // make it clear when int/float conversions are happening.
// //
static int64_t compare_double_double(double x, double y) { static int compare_double_double(double x, double y) {
return (x < y) ? -1 : ((x > y) ? 1 : 0); return (x < y) ? -1 : ((x > y) ? 1 : 0);
} }
static int64_t compare_int64_double(int64_t x, double y) { static int compare_int64_double(int64_t x, double y) {
if (isnan(y)) { if (isnan(y)) {
return 0; // clojure and python do this return 0; // clojure and python do this
} else if ((y > ((double) - MAX_INT_IN_DBL)) && (y < ((double) MAX_INT_IN_DBL))) { } else if ((y > (- ((double) MAX_INT_IN_DBL))) && (y < ((double) MAX_INT_IN_DBL))) {
double dx = (double) x; double dx = (double) x;
return compare_double_double(dx, y); return compare_double_double(dx, y);
} else if (y > ((double) INT64_MAX)) { } else if (y > ((double) INT64_MAX)) {
@ -226,7 +226,7 @@ static int64_t compare_int64_double(int64_t x, double y) {
} }
} }
static int64_t compare_uint64_double(uint64_t x, double y) { static int compare_uint64_double(uint64_t x, double y) {
if (isnan(y)) { if (isnan(y)) {
return 0; // clojure and python do this return 0; // clojure and python do this
} else if (y < 0) { } else if (y < 0) {

6
src/core/thread.c
View File

@ -74,7 +74,7 @@ static const char janet_thread_flags[] = "hac";
typedef struct { typedef struct {
JanetMailbox *original; JanetMailbox *original;
JanetMailbox *newbox; JanetMailbox *newbox;
int flags; uint64_t flags;
} JanetMailboxPair; } JanetMailboxPair;
static JANET_THREAD_LOCAL JanetMailbox *janet_vm_mailbox = NULL; static JANET_THREAD_LOCAL JanetMailbox *janet_vm_mailbox = NULL;
@ -181,7 +181,7 @@ static int thread_mark(void *p, size_t size) {
return 0; return 0;
} }
static JanetMailboxPair *make_mailbox_pair(JanetMailbox *original, int flags) { static JanetMailboxPair *make_mailbox_pair(JanetMailbox *original, uint64_t flags) {
JanetMailboxPair *pair = malloc(sizeof(JanetMailboxPair)); JanetMailboxPair *pair = malloc(sizeof(JanetMailboxPair));
if (NULL == pair) { if (NULL == pair) {
JANET_OUT_OF_MEMORY; JANET_OUT_OF_MEMORY;
@ -600,7 +600,7 @@ static Janet cfun_thread_new(int32_t argc, Janet *argv) {
if (cap < 1 || cap > UINT16_MAX) { if (cap < 1 || cap > UINT16_MAX) {
janet_panicf("bad slot #1, expected integer in range [1, 65535], got %d", cap); janet_panicf("bad slot #1, expected integer in range [1, 65535], got %d", cap);
} }
int flags = argc >= 3 ? janet_getflags(argv, 2, janet_thread_flags) : JANET_THREAD_ABSTRACTS; uint64_t flags = argc >= 3 ? janet_getflags(argv, 2, janet_thread_flags) : JANET_THREAD_ABSTRACTS;
JanetTable *encode; JanetTable *encode;
if (flags & JANET_THREAD_HEAVYWEIGHT) { if (flags & JANET_THREAD_HEAVYWEIGHT) {
encode = janet_get_core_table("make-image-dict"); encode = janet_get_core_table("make-image-dict");