diff options
| author | Stefan Monnier | 2014-10-02 08:27:19 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-10-02 08:27:19 -0400 |
| commit | b861616a6c826b57a10deeb3c4dcdb4d4c98583d (patch) | |
| tree | 916cfe3a70b2fe192cbd0cac648e8d24e3cdac68 /src | |
| parent | 64a67db3cd6e8c81a747b03e35714ee5b411a976 (diff) | |
| download | emacs-b861616a6c826b57a10deeb3c4dcdb4d4c98583d.tar.gz emacs-b861616a6c826b57a10deeb3c4dcdb4d4c98583d.zip | |
* src/lisp.h: Fix up compilation for USE_STACK_LISP_OBJECTS=false.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2c5aa61e417..f3c881f630d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-10-02 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2014-10-02 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * lisp.h: Fix up compilation for USE_STACK_LISP_OBJECTS=false. | ||
| 4 | |||
| 3 | * nsselect.m (ns-own-selection-internal, ns-disown-selection-internal): | 5 | * nsselect.m (ns-own-selection-internal, ns-disown-selection-internal): |
| 4 | Rename from the "x-" prefix. | 6 | Rename from the "x-" prefix. |
| 5 | 7 | ||
diff --git a/src/lisp.h b/src/lisp.h index aeb1a71e481..0425744b301 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -4658,7 +4658,7 @@ enum | |||
| 4658 | 4658 | ||
| 4659 | /* Check whether stack-allocated strings are ASCII-only. */ | 4659 | /* Check whether stack-allocated strings are ASCII-only. */ |
| 4660 | 4660 | ||
| 4661 | #ifdef ENABLE_CHECKING | 4661 | #if defined (ENABLE_CHECKING) && USE_STACK_LISP_OBJECTS |
| 4662 | extern const char *verify_ascii (const char *); | 4662 | extern const char *verify_ascii (const char *); |
| 4663 | #else | 4663 | #else |
| 4664 | # define verify_ascii(str) (str) | 4664 | # define verify_ascii(str) (str) |