Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

Conflicts:
	H/dlocals.h
	H/hlocals.h
	H/ilocals.h
	H/rlocals.h
This commit is contained in:
Joao
2011-04-29 16:44:59 +01:00
21 changed files with 219 additions and 105 deletions

View File

@@ -218,7 +218,7 @@ struct global_optyap_data{
#ifdef TABLE_LOCK_AT_WRITE_LEVEL
lockvar table_lock[TABLE_LOCK_BUCKETS];
#endif /* TABLE_LOCK_AT_WRITE_LEVEL */
#ifdef TIMESTAMP_CHECKThreads
#ifdef TIMESTAMP_CHECK
long timestamp;
#endif /* TIMESTAMP_CHECK */
#endif /* TABLING */