Merge 95f3d8867a93b01d32252c91c22abf95fd7c3b0e into 5cb74797fe996b706be1dc29d1096c7baefdfbfb

Merge branch 'signalwire:master' into master
2025-02-09 01:06:00 +00:00 · 2025-01-17 16:41:08 +00:00 · 2023-09-09 21:23:07 +08:00 · 2023-08-16 01:03:12 +08:00 · 2023-08-12 23:41:46 +08:00 · 2023-08-02 00:04:48 +08:00
3 changed files with 10 additions and 8 deletions
--- a/src/switch_console.c
+++ b/src/switch_console.c
@ -82,7 +82,7 @@ static int console_bufferInput(char *buf, int len, char *cmd, int key);
 static char *console_fnkeys[12];

 /*
- * Load from console.conf XML file the section:
+ * Load from switch.conf XML file the section:
 * <keybindings>
 * <key name="1" value="show calls"/>
 * </keybindings>
--- a/src/switch_core_rwlock.c
+++ b/src/switch_core_rwlock.c
@ -145,25 +145,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock_hangup(switch_core

 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(void) switch_core_session_perform_write_lock(switch_core_session_t *session, const char *file, const char *func, int line)
-{
-
-	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Write lock ACQUIRED\n",
-					  switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
 #else
 SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session)
+#endif
 {
+#ifdef SWITCH_DEBUG_RWLOCKS
+	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Write lock ACQUIRED\n",
+					  switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
 #endif
 	switch_thread_rwlock_wrlock(session->rwlock);
 }

 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(void) switch_core_session_perform_rwunlock(switch_core_session_t *session, const char *file, const char *func, int line)
-{
-	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Read/Write lock CLEARED\n",
-					  switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
 #else
 SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session)
+#endif
 {
+#ifdef SWITCH_DEBUG_RWLOCKS
+	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s %s Read/Write lock CLEARED\n",
+					  switch_core_session_get_uuid(session), switch_channel_get_name(session->channel));
 #endif
 	switch_thread_rwlock_unlock(session->rwlock);

--- a/src/switch_ivr_say.c
+++ b/src/switch_ivr_say.c
@ -68,6 +68,7 @@ static char *SAY_GENDER_NAMES[] = {
 	"MASCULINE",
 	"FEMININE",
 	"NEUTER",
+	"UTRUM",
 	NULL
 };
Author	SHA1	Message	Date
谭映宇	db4f8773c1	Merge 95f3d8867a93b01d32252c91c22abf95fd7c3b0e into 5cb74797fe996b706be1dc29d1096c7baefdfbfb	2025-01-17 16:41:08 +00:00
谭映宇	95f3d8867a	Merge branch 'signalwire:master' into master	2023-09-09 21:23:07 +08:00
谭映宇	bd46b172b2	Merge branch 'signalwire:master' into master	2023-08-16 01:03:12 +08:00
谭映宇	2a51ef2dda	Merge branch 'signalwire:master' into master	2023-08-12 23:41:46 +08:00
谭映宇	108b4cce7f	Merge branch 'signalwire:master' into master	2023-08-02 00:04:48 +08:00
谭映宇	f543e2f08a	Update switch_console.c comment is error.	2023-07-31 11:55:05 +08:00
谭映宇	3921d5fcd9	Merge branch 'signalwire:master' into master	2023-07-29 13:20:19 +08:00
谭映宇	0f6b06b840	Merge branch 'signalwire:master' into master	2023-07-29 00:25:08 +08:00
谭映宇	43f2a5c8d0	Update switch_ivr_say.c	2023-07-25 18:46:53 +08:00
谭映宇	ab6b1c77d6	Merge branch 'signalwire:master' into master	2023-07-25 16:26:26 +08:00
谭映宇	988424fba5	Update switch_core_rwlock.c	2023-07-22 18:13:32 +08:00