diff options
| author | Stefan Monnier | 2012-07-17 07:52:00 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-07-17 07:52:00 -0400 |
| commit | 4dc7c8d5795458e89d19b59f64760e155c2cd70b (patch) | |
| tree | 2eb1ef73d69102f0ebee4e39056078adcdd49529 /admin/CPP-DEFINES | |
| parent | 2143fa32671374cdef26fdb24355bf690728a344 (diff) | |
| parent | fbf31a9c2c08c86a7ab490cb7b920245b829a61d (diff) | |
| download | emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.tar.gz emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.zip | |
Merge from emacs-24
Diffstat (limited to 'admin/CPP-DEFINES')
| -rw-r--r-- | admin/CPP-DEFINES | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 73c4ed2eb4d..9fc7ce3e33d 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES | |||
| @@ -95,7 +95,6 @@ EMACS_CONFIGURATION | |||
| 95 | EMACS_CONFIG_OPTIONS | 95 | EMACS_CONFIG_OPTIONS |
| 96 | EMACS_INT | 96 | EMACS_INT |
| 97 | EMACS_UINT | 97 | EMACS_UINT |
| 98 | FILE_SYSTEM_CASE | ||
| 99 | FLOAT_CHECK_DOMAIN | 98 | FLOAT_CHECK_DOMAIN |
| 100 | GC_LISP_OBJECT_ALIGNMENT | 99 | GC_LISP_OBJECT_ALIGNMENT |
| 101 | GC_MARK_SECONDARY_STACK | 100 | GC_MARK_SECONDARY_STACK |