diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/ccl.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/ccl.h')
| -rw-r--r-- | src/ccl.h | 2 |
1 files changed, 0 insertions, 2 deletions
| @@ -81,8 +81,6 @@ extern bool setup_ccl_program (struct ccl_program *, Lisp_Object); | |||
| 81 | extern void ccl_driver (struct ccl_program *, int *, int *, int, int, | 81 | extern void ccl_driver (struct ccl_program *, int *, int *, int, int, |
| 82 | Lisp_Object); | 82 | Lisp_Object); |
| 83 | 83 | ||
| 84 | extern Lisp_Object Qccl, Qcclp; | ||
| 85 | |||
| 86 | #define CHECK_CCL_PROGRAM(x) \ | 84 | #define CHECK_CCL_PROGRAM(x) \ |
| 87 | do { \ | 85 | do { \ |
| 88 | if (NILP (Fccl_program_p (x))) \ | 86 | if (NILP (Fccl_program_p (x))) \ |