From 0adab82a71fe2e878c5dfb57ecf4c00aec7e01c7 Mon Sep 17 00:00:00 2001 From: Philipp Schafft Date: Sun, 17 Jun 2018 10:15:32 +0000 Subject: [PATCH] Update: Moved ice_config_t into "icecasttypes.h" --- src/cfgfile.h | 5 +++-- src/icecasttypes.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cfgfile.h b/src/cfgfile.h index cdeb4c92..a017047c 100644 --- a/src/cfgfile.h +++ b/src/cfgfile.h @@ -27,6 +27,7 @@ struct _mount_proxy; #include #include "common/thread/thread.h" #include "common/avl/avl.h" +#include "icecasttypes.h" #include "slave.h" #include "connection.h" @@ -184,7 +185,7 @@ typedef struct _config_tls_context { char *cipher_list; } config_tls_context_t; -typedef struct ice_config_tag { +struct ice_config_tag { char *config_filename; char *location; @@ -260,7 +261,7 @@ typedef struct ice_config_tag { int yp_url_timeout[MAX_YP_DIRECTORIES]; int yp_touch_interval[MAX_YP_DIRECTORIES]; int num_yp_directories; -} ice_config_t; +}; typedef struct { rwlock_t config_lock; diff --git a/src/icecasttypes.h b/src/icecasttypes.h index 9c23c6c4..0b529b32 100644 --- a/src/icecasttypes.h +++ b/src/icecasttypes.h @@ -40,5 +40,8 @@ typedef struct acl_tag acl_t; typedef struct auth_tag auth_t; +/* ---[ cfgfile.[ch] ]--- */ + +typedef struct ice_config_tag ice_config_t; #endif