Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Conflicts:
	JIT/JIT_Compiler.cpp
	JIT/configure.in
	JIT/jit_analysispreds.c
	JIT/jit_transformpreds.c
	configure
	packages/cplint/Makefile.in
This commit is contained in:
Vítor Santos Costa
2015-01-18 02:54:53 +00:00
108 changed files with 29874 additions and 29395 deletions

View File

@@ -77,7 +77,7 @@ static Int p_analysis_output_file( USES_REGS1 );
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
static Int
p_disable_analysis_pass( USES_REGS1 )
{
@@ -101,7 +101,7 @@ p_disable_analysis_pass( USES_REGS1 )
int i = 0, j = 0;
char *tmp;
// gets string from atom and stores it on 'str'
char *str = (char*)malloc(YAP_AtomNameLength(AtomOfTerm(t))*sizeof(char));
char *str = (char*)malloc(YAP_AtomNameLength(AtomOfTerm(t))*sizeof(char)
strcpy(str, AtomName(AtomOfTerm(t)));
// Makes upper characters of 'str' (for comparison)
UPPER_ENTRY(str);