From 77936017aff66041231f078e8b269247c721456e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 17 Oct 2013 21:32:26 -0600 Subject: [PATCH] change condition-variablep to condition-variable-p --- src/lisp.h | 4 ++-- src/thread.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lisp.h b/src/lisp.h index 03628e13ac2..f57b21ffbdc 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -792,7 +792,7 @@ extern double extract_float (Lisp_Object); extern Lisp_Object Qprocessp; /* Defined in thread.c. */ -extern Lisp_Object Qthreadp, Qmutexp, Qcondition_variablep; +extern Lisp_Object Qthreadp, Qmutexp, Qcondition_variable_p; /* Defined in window.c. */ extern Lisp_Object Qwindowp; @@ -2538,7 +2538,7 @@ CHECK_MUTEX (Lisp_Object x) LISP_INLINE void CHECK_CONDVAR (Lisp_Object x) { - CHECK_TYPE (CONDVARP (x), Qcondition_variablep, x); + CHECK_TYPE (CONDVARP (x), Qcondition_variable_p, x); } /* Since we can't assign directly to the CAR or CDR fields of a cons diff --git a/src/thread.c b/src/thread.c index f060a002a3a..cd9e916c571 100644 --- a/src/thread.c +++ b/src/thread.c @@ -33,7 +33,7 @@ static struct thread_state *all_threads = &primary_thread; static sys_mutex_t global_lock; -Lisp_Object Qthreadp, Qmutexp, Qcondition_variablep; +Lisp_Object Qthreadp, Qmutexp, Qcondition_variable_p; @@ -969,6 +969,6 @@ syms_of_threads (void) staticpro (&Qthreadp); Qmutexp = intern_c_string ("mutexp"); staticpro (&Qmutexp); - Qcondition_variablep = intern_c_string ("condition-variablep"); - staticpro (&Qcondition_variablep); + Qcondition_variable_p = intern_c_string ("condition-variable-p"); + staticpro (&Qcondition_variable_p); } -- 2.39.5