aboutsummaryrefslogtreecommitdiffstats
path: root/src/ccl.h
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /src/ccl.h
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/ccl.h')
-rw-r--r--src/ccl.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ccl.h b/src/ccl.h
index b01a73f3a2d..7b72dc74104 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -81,8 +81,6 @@ extern bool setup_ccl_program (struct ccl_program *, Lisp_Object);
81extern void ccl_driver (struct ccl_program *, int *, int *, int, int, 81extern void ccl_driver (struct ccl_program *, int *, int *, int, int,
82 Lisp_Object); 82 Lisp_Object);
83 83
84extern 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))) \