Merge branch 'feature/cwarnings-removal' of https://github.com/ahmadsalim/Idris-dev into ahmadsalim-feature/cwarnings-removal

Conflicts:
	rts/idris_opts.c
This commit is contained in:
Edwin Brady 2013-11-20 08:20:44 +00:00
commit d33d0bfa29
3 changed files with 6 additions and 7 deletions

View File

@ -6,18 +6,17 @@
#include <string.h>
const char usage[] =
"\n" \
#define USAGE "\n" \
"Usage: <prog> [+RTS <rtsopts> -RTS] <args>\n\n" \
"Options:\n\n" \
" -? Print this message and exits.\n" \
" -s Summary GC statistics.\n" \
" -H Initial heap size. Egs: -H4M, -H500K, -H1G\n" \
" -K Sets the maximum stack size. Egs: -K8M\n" \
"\n";
"\n"
void print_usage(FILE * s) {
fprintf(s, usage);
fprintf(s, USAGE);
}
int read_size(char * str) {

View File

@ -161,7 +161,7 @@ VAL MKSTR(VM* vm, const char* str) {
return cl;
}
VAL MKPTR(VM* vm, const void* ptr) {
VAL MKPTR(VM* vm, void* ptr) {
Closure* cl = allocate(vm, sizeof(Closure), 0);
SETTY(cl, PTR);
cl -> info.ptr = ptr;
@ -452,7 +452,7 @@ void* runThread(void* arg) {
free(td);
Stats stats = terminate(vm);
// Stats stats = terminate(vm);
// aggregate_stats(&(td->vm->stats), &stats);
return NULL;
}

View File

@ -143,7 +143,7 @@ typedef intptr_t i_int;
// Creating new values (each value placed at the top of the stack)
VAL MKFLOAT(VM* vm, double val);
VAL MKSTR(VM* vm, const char* str);
VAL MKPTR(VM* vm, const void* ptr);
VAL MKPTR(VM* vm, void* ptr);
VAL MKB8(VM* vm, uint8_t b);
VAL MKB16(VM* vm, uint16_t b);
VAL MKB32(VM* vm, uint32_t b);