diff options
| author | Glenn Morris | 2014-06-01 17:18:22 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-06-01 17:18:22 -0700 |
| commit | 953e106ac84587e765244995687b088969b5f6e1 (patch) | |
| tree | a4d54b892e04b9123bc79ecffd69310f5807399e /src/alloc.c | |
| parent | eed652d649d28e9dafdb01f9c7425d7d28899e0d (diff) | |
| parent | afca0e759015ebc753b0c343ac45ac476dd31e9d (diff) | |
| download | emacs-953e106ac84587e765244995687b088969b5f6e1.tar.gz emacs-953e106ac84587e765244995687b088969b5f6e1.zip | |
Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index d728c356109..60b035e6028 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -7200,7 +7200,6 @@ union | |||
| 7200 | enum char_bits char_bits; | 7200 | enum char_bits char_bits; |
| 7201 | enum CHECK_LISP_OBJECT_TYPE CHECK_LISP_OBJECT_TYPE; | 7201 | enum CHECK_LISP_OBJECT_TYPE CHECK_LISP_OBJECT_TYPE; |
| 7202 | enum DEFAULT_HASH_SIZE DEFAULT_HASH_SIZE; | 7202 | enum DEFAULT_HASH_SIZE DEFAULT_HASH_SIZE; |
| 7203 | enum FLOAT_TO_STRING_BUFSIZE FLOAT_TO_STRING_BUFSIZE; | ||
| 7204 | enum Lisp_Bits Lisp_Bits; | 7203 | enum Lisp_Bits Lisp_Bits; |
| 7205 | enum Lisp_Compiled Lisp_Compiled; | 7204 | enum Lisp_Compiled Lisp_Compiled; |
| 7206 | enum maxargs maxargs; | 7205 | enum maxargs maxargs; |