mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-12-04 14:46:30 -05:00
Fix up types after thread type rename earlier.
svn path=/trunk/icecast/; revision=4175
This commit is contained in:
parent
d218eedf9a
commit
65c0bfbba5
@ -46,7 +46,7 @@ typedef struct con_queue_tag {
|
||||
} con_queue_t;
|
||||
|
||||
typedef struct _thread_queue_tag {
|
||||
thread_t *thread_id;
|
||||
thread_type *thread_id;
|
||||
struct _thread_queue_tag *next;
|
||||
} thread_queue_t;
|
||||
|
||||
@ -159,7 +159,7 @@ static void _signal_pool(void)
|
||||
thread_cond_signal(&_pool_cond);
|
||||
}
|
||||
|
||||
static void _push_thread(thread_queue_t **queue, thread_t *thread_id)
|
||||
static void _push_thread(thread_queue_t **queue, thread_type *thread_id)
|
||||
{
|
||||
/* create item */
|
||||
thread_queue_t *item = (thread_queue_t *)malloc(sizeof(thread_queue_t));
|
||||
@ -177,9 +177,9 @@ static void _push_thread(thread_queue_t **queue, thread_t *thread_id)
|
||||
thread_mutex_unlock(&_queue_mutex);
|
||||
}
|
||||
|
||||
static thread_t *_pop_thread(thread_queue_t **queue)
|
||||
static thread_type *_pop_thread(thread_queue_t **queue)
|
||||
{
|
||||
thread_t *id;
|
||||
thread_type *id;
|
||||
thread_queue_t *item;
|
||||
|
||||
thread_mutex_lock(&_queue_mutex);
|
||||
@ -204,7 +204,7 @@ static void _build_pool(void)
|
||||
{
|
||||
ice_config_t *config;
|
||||
int i;
|
||||
thread_t *tid;
|
||||
thread_type *tid;
|
||||
char buff[64];
|
||||
|
||||
config = config_get_config();
|
||||
@ -218,7 +218,7 @@ static void _build_pool(void)
|
||||
|
||||
static void _destroy_pool(void)
|
||||
{
|
||||
thread_t *id;
|
||||
thread_type *id;
|
||||
int i;
|
||||
|
||||
i = 0;
|
||||
|
@ -16,6 +16,7 @@
|
||||
#include "format_vorbis.h"
|
||||
#include "format_mp3.h"
|
||||
|
||||
#include "log.h"
|
||||
#include "logging.h"
|
||||
#define CATMODULE "format"
|
||||
|
||||
|
@ -50,7 +50,7 @@ static avl_tree *pending_tree;
|
||||
static avl_tree *mimetypes = NULL;
|
||||
|
||||
static cond_t fserv_cond;
|
||||
static thread_t *fserv_thread;
|
||||
static thread_type *fserv_thread;
|
||||
static int run_fserv;
|
||||
static int fserve_clients;
|
||||
static int client_tree_changed=0;
|
||||
|
@ -45,7 +45,7 @@
|
||||
#define CATMODULE "slave"
|
||||
|
||||
static void *_slave_thread(void *arg);
|
||||
thread_t *_slave_thread_id;
|
||||
thread_type *_slave_thread_id;
|
||||
static int _initialized = 0;
|
||||
|
||||
void slave_initialize(void) {
|
||||
|
@ -33,7 +33,7 @@ typedef struct _event_listener_tag
|
||||
} event_listener_t;
|
||||
|
||||
int _stats_running = 0;
|
||||
thread_t *_stats_thread_id;
|
||||
thread_type *_stats_thread_id;
|
||||
int _stats_threads = 0;
|
||||
|
||||
stats_t _stats;
|
||||
|
Loading…
Reference in New Issue
Block a user