diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-10 22:47:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-10 22:47:05 -0700 |
| commit | 78cf1fe8a256ffc91533b43eb851bf4519e9fbcc (patch) | |
| tree | 84b4d0a579e858040d49e6561be096132860446b /src/dispextern.h | |
| parent | fc83f7d3d422039f041bbcc4f0cb75a1699421ad (diff) | |
| parent | b50691aaafa255709b1117000ce6fb98d9772695 (diff) | |
| download | emacs-78cf1fe8a256ffc91533b43eb851bf4519e9fbcc.tar.gz emacs-78cf1fe8a256ffc91533b43eb851bf4519e9fbcc.tar.bz2 emacs-78cf1fe8a256ffc91533b43eb851bf4519e9fbcc.zip | |
Merge from trunk.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 15e44e0286e..211a1b06659 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2792,16 +2792,9 @@ struct image /* 1 means that loading the image failed. Don't try again. */ unsigned load_failed_p; - /* A place for image types to store additional data. The member - data.lisp_val is marked during GC, so it's safe to store Lisp data - there. Image types should free this data when their `free' - function is called. */ - struct - { - int int_val; - void *ptr_val; - Lisp_Object lisp_val; - } data; + /* A place for image types to store additional data. It is marked + during GC. */ + Lisp_Object lisp_data; /* Hash value of image specification to speed up comparisons. */ EMACS_UINT hash; |