Merge branch 'master' into v2.1

2013-10-14 19:34:06 +02:00
parent 4ccb2dd3bb 5d25645a21
commit d0b48ec996
4 changed files with 18 additions and 1 deletions
--- a/src/lj_obj.h
+++ b/src/lj_obj.h
@@ -494,7 +494,7 @@ typedef struct GCState {
  MSize threshold;	/* Memory threshold. */
  uint8_t currentwhite;	/* Current white color. */
  uint8_t state;	/* GC state. */
-  uint8_t unused1;
+  uint8_t nocdatafin;	/* No cdata finalizer called. */
  uint8_t unused2;
  MSize sweepstr;	/* Sweep position in string table. */
  GCRef root;		/* List of all collectable objects. */