diff options
| author | Tom Tromey | 2013-10-17 21:32:26 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-10-17 21:32:26 -0600 |
| commit | 77936017aff66041231f078e8b269247c721456e (patch) | |
| tree | f8b52e3849d27705f77ea3c5a1203b85bda7cf2e /src | |
| parent | bed10876dba330b24419a6144dc62db52bb273ab (diff) | |
| download | emacs-77936017aff66041231f078e8b269247c721456e.tar.gz emacs-77936017aff66041231f078e8b269247c721456e.zip | |
change condition-variablep to condition-variable-p
Diffstat (limited to 'src')
| -rw-r--r-- | src/lisp.h | 4 | ||||
| -rw-r--r-- | 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); | |||
| 792 | extern Lisp_Object Qprocessp; | 792 | extern Lisp_Object Qprocessp; |
| 793 | 793 | ||
| 794 | /* Defined in thread.c. */ | 794 | /* Defined in thread.c. */ |
| 795 | extern Lisp_Object Qthreadp, Qmutexp, Qcondition_variablep; | 795 | extern Lisp_Object Qthreadp, Qmutexp, Qcondition_variable_p; |
| 796 | 796 | ||
| 797 | /* Defined in window.c. */ | 797 | /* Defined in window.c. */ |
| 798 | extern Lisp_Object Qwindowp; | 798 | extern Lisp_Object Qwindowp; |
| @@ -2538,7 +2538,7 @@ CHECK_MUTEX (Lisp_Object x) | |||
| 2538 | LISP_INLINE void | 2538 | LISP_INLINE void |
| 2539 | CHECK_CONDVAR (Lisp_Object x) | 2539 | CHECK_CONDVAR (Lisp_Object x) |
| 2540 | { | 2540 | { |
| 2541 | CHECK_TYPE (CONDVARP (x), Qcondition_variablep, x); | 2541 | CHECK_TYPE (CONDVARP (x), Qcondition_variable_p, x); |
| 2542 | } | 2542 | } |
| 2543 | 2543 | ||
| 2544 | /* Since we can't assign directly to the CAR or CDR fields of a cons | 2544 | /* 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; | |||
| 33 | 33 | ||
| 34 | static sys_mutex_t global_lock; | 34 | static sys_mutex_t global_lock; |
| 35 | 35 | ||
| 36 | Lisp_Object Qthreadp, Qmutexp, Qcondition_variablep; | 36 | Lisp_Object Qthreadp, Qmutexp, Qcondition_variable_p; |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | 39 | ||
| @@ -969,6 +969,6 @@ syms_of_threads (void) | |||
| 969 | staticpro (&Qthreadp); | 969 | staticpro (&Qthreadp); |
| 970 | Qmutexp = intern_c_string ("mutexp"); | 970 | Qmutexp = intern_c_string ("mutexp"); |
| 971 | staticpro (&Qmutexp); | 971 | staticpro (&Qmutexp); |
| 972 | Qcondition_variablep = intern_c_string ("condition-variablep"); | 972 | Qcondition_variable_p = intern_c_string ("condition-variable-p"); |
| 973 | staticpro (&Qcondition_variablep); | 973 | staticpro (&Qcondition_variable_p); |
| 974 | } | 974 | } |