Commit 53f56234 authored by sewardj's avatar sewardj

[project @ 2000-03-13 10:39:11 by sewardj]

Clean up a couple of compilation warnings.
parent 9cf6d0f7
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* Copyright (c) 1994-1998. * Copyright (c) 1994-1998.
* *
* $RCSfile: Evaluator.c,v $ * $RCSfile: Evaluator.c,v $
* $Revision: 1.37 $ * $Revision: 1.38 $
* $Date: 2000/03/13 10:30:25 $ * $Date: 2000/03/13 10:39:11 $
* ---------------------------------------------------------------------------*/ * ---------------------------------------------------------------------------*/
#include "Rts.h" #include "Rts.h"
...@@ -2122,14 +2122,14 @@ static StgClosure* makeErrorCall ( const char* msg ) ...@@ -2122,14 +2122,14 @@ static StgClosure* makeErrorCall ( const char* msg )
StgPtr CreateByteArrayToHoldInteger ( int nbytes ) StgPtr CreateByteArrayToHoldInteger ( int nbytes )
{ {
StgInt words = (nbytes+sizeof(W_)-1)/sizeof(W_); StgWord words = (nbytes+sizeof(W_)-1)/sizeof(W_);
StgWord size = sizeofW(StgArrWords) + words; StgWord size = sizeofW(StgArrWords) + words;
StgArrWords* arr = (StgArrWords*)allocate(size); StgArrWords* arr = (StgArrWords*)allocate(size);
SET_HDR(arr,&ARR_WORDS_info,CCCS); SET_HDR(arr,&ARR_WORDS_info,CCCS);
arr->words = words; arr->words = words;
ASSERT(nbytes <= arr->words * sizeof(W_)); ASSERT((W_)nbytes <= arr->words * sizeof(W_));
#ifdef DEBUG #ifdef DEBUG
{nat i; {StgWord i;
for (i = 0; i < words; ++i) { for (i = 0; i < words; ++i) {
arr->payload[i] = 0xdeadbeef; arr->payload[i] = 0xdeadbeef;
}} }}
...@@ -2216,7 +2216,7 @@ void SloppifyIntegerEnd ( StgPtr arr0 ) ...@@ -2216,7 +2216,7 @@ void SloppifyIntegerEnd ( StgPtr arr0 )
} }
void myStackCheck ( Capability* cap ) static void myStackCheck ( Capability* cap )
{ {
/* fprintf(stderr, "myStackCheck\n"); */ /* fprintf(stderr, "myStackCheck\n"); */
if (!(gSpLim <= gSp && gSp <= stgCast(StgPtr,gSu))) { if (!(gSpLim <= gSp && gSp <= stgCast(StgPtr,gSu))) {
...@@ -2968,7 +2968,7 @@ static void* enterBCO_primop2 ( int primop2code, ...@@ -2968,7 +2968,7 @@ static void* enterBCO_primop2 ( int primop2code,
*/ */
PushCPtr((StgClosure*)(*bco)); PushCPtr((StgClosure*)(*bco));
*return2 = ThreadBlocked; *return2 = ThreadBlocked;
return (void*)(1+(NULL)); return (void*)(1+(char*)(NULL));
} else { } else {
PushCPtr(mvar->value); PushCPtr(mvar->value);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment