diff options
author | Mike Pall <mike> | 2013-10-14 19:34:06 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-10-14 19:34:06 +0200 |
commit | d0b48ec996cb20f05f5c7b0059eddf0da9198de0 (patch) | |
tree | aadf4957fa380fc70947267218e5a5bc91c396f9 /src/lj_obj.h | |
parent | 4ccb2dd3bb576f742f987cf0027214e733325404 (diff) | |
parent | 5d25645a210f32dddecde9c50afb14f9ee63e180 (diff) | |
download | luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.tar.gz luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.tar.bz2 luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_obj.h')
-rw-r--r-- | src/lj_obj.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_obj.h b/src/lj_obj.h index b1bbf1c9..2d7a19a1 100644 --- a/src/lj_obj.h +++ b/src/lj_obj.h | |||
@@ -494,7 +494,7 @@ typedef struct GCState { | |||
494 | MSize threshold; /* Memory threshold. */ | 494 | MSize threshold; /* Memory threshold. */ |
495 | uint8_t currentwhite; /* Current white color. */ | 495 | uint8_t currentwhite; /* Current white color. */ |
496 | uint8_t state; /* GC state. */ | 496 | uint8_t state; /* GC state. */ |
497 | uint8_t unused1; | 497 | uint8_t nocdatafin; /* No cdata finalizer called. */ |
498 | uint8_t unused2; | 498 | uint8_t unused2; |
499 | MSize sweepstr; /* Sweep position in string table. */ | 499 | MSize sweepstr; /* Sweep position in string table. */ |
500 | GCRef root; /* List of all collectable objects. */ | 500 | GCRef root; /* List of all collectable objects. */ |