Merge branch 'w-extra' of git://github.com/verpeteren/wren into verpeteren-w-extra

Browse Source
This commit is contained in:
Bob Nystrom 2015-03-22 21:49:31 -07:00
commit efa6f32d25
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/wren.mk
View File

@ -25,8 +25,8 @@ CLI_SOURCES := $(wildcard src/cli/*.c)
VM_SOURCES := $(wildcard src/vm/*.c) VM_SOURCES := $(wildcard src/vm/*.c)
BUILD_DIR := build BUILD_DIR := build
CFLAGS := -Wall -Werror -Wsign-compare -Wtype-limits -Wuninitialized CFLAGS := -Wall -Wextra -Werror -Wsign-compare -Wtype-limits -Wuninitialized -Wno-unused-parameter
# TODO: Add -Wextra. # TODO: dump '-Wno-unused-parameter'
# Mode configuration. # Mode configuration.
ifeq ($(MODE),debug) ifeq ($(MODE),debug)

2
src/vm/wren_vm.c
View File

@ -1370,7 +1370,7 @@ void wrenReleaseMethod(WrenVM* vm, WrenMethod* method)
} }
// Execute [source] in the context of the core module. // Execute [source] in the context of the core module.
WrenInterpretResult static loadIntoCore(WrenVM* vm, const char* source) static WrenInterpretResult loadIntoCore(WrenVM* vm, const char* source)
{ {
ObjModule* coreModule = getCoreModule(vm); ObjModule* coreModule = getCoreModule(vm);