Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts:
	src/main.cpp
This commit is contained in:
Jason Turner 2014-01-23 12:54:28 -07:00
commit 3f78af9a3d

View File

@ -31,10 +31,13 @@ char* readline(const char* p)
return std::cin.eof() ? NULL : mystrdup(retval.c_str()); return std::cin.eof() ? NULL : mystrdup(retval.c_str());
} }
void add_history(const char*){} void add_history(const char*){}
void using_history(){} void using_history(){}
#endif #endif
void *cast_module_symbol(std::string (*t_path)()) void *cast_module_symbol(std::string (*t_path)())
{ {
union cast_union union cast_union