mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-12-04 14:46:30 -05:00
Update: Move most common types into "icecasttypes.h"
This commit is contained in:
parent
50a9d3382a
commit
6ffc893b6a
@ -18,9 +18,7 @@
|
|||||||
#include <libxml/tree.h>
|
#include <libxml/tree.h>
|
||||||
#include "common/httpp/httpp.h"
|
#include "common/httpp/httpp.h"
|
||||||
|
|
||||||
struct acl_tag;
|
#include "icecasttypes.h"
|
||||||
typedef struct acl_tag acl_t;
|
|
||||||
|
|
||||||
#include "admin.h"
|
#include "admin.h"
|
||||||
|
|
||||||
typedef enum acl_policy_tag {
|
typedef enum acl_policy_tag {
|
||||||
|
12
src/admin.h
12
src/admin.h
@ -18,17 +18,7 @@
|
|||||||
#include <libxml/tree.h>
|
#include <libxml/tree.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
/* Command IDs */
|
#include "icecasttypes.h"
|
||||||
typedef int32_t admin_command_id_t;
|
|
||||||
|
|
||||||
/* formats */
|
|
||||||
typedef enum {
|
|
||||||
ADMIN_FORMAT_AUTO,
|
|
||||||
ADMIN_FORMAT_RAW,
|
|
||||||
ADMIN_FORMAT_TRANSFORMED,
|
|
||||||
ADMIN_FORMAT_PLAINTEXT
|
|
||||||
} admin_format_t;
|
|
||||||
|
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
#include "refbuf.h"
|
#include "refbuf.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
@ -18,12 +18,10 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct source_tag;
|
|
||||||
typedef struct auth_tag auth_t;
|
|
||||||
|
|
||||||
#include <libxml/xmlmemory.h>
|
#include <libxml/xmlmemory.h>
|
||||||
#include <libxml/parser.h>
|
#include <libxml/parser.h>
|
||||||
#include <libxml/tree.h>
|
#include <libxml/tree.h>
|
||||||
|
#include "icecasttypes.h"
|
||||||
#include "cfgfile.h"
|
#include "cfgfile.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "common/thread/thread.h"
|
#include "common/thread/thread.h"
|
||||||
|
@ -19,8 +19,7 @@
|
|||||||
#ifndef __CLIENT_H__
|
#ifndef __CLIENT_H__
|
||||||
#define __CLIENT_H__
|
#define __CLIENT_H__
|
||||||
|
|
||||||
typedef struct _client_tag client_t;
|
#include "icecasttypes.h"
|
||||||
|
|
||||||
#include "errors.h"
|
#include "errors.h"
|
||||||
#include "connection.h"
|
#include "connection.h"
|
||||||
#include "refbuf.h"
|
#include "refbuf.h"
|
||||||
|
@ -9,4 +9,36 @@
|
|||||||
#ifndef __ICECASTTYPES_H__
|
#ifndef __ICECASTTYPES_H__
|
||||||
#define __ICECASTTYPES_H__
|
#define __ICECASTTYPES_H__
|
||||||
|
|
||||||
|
#include "compat.h"
|
||||||
|
|
||||||
|
/* ---[ client.[ch] ]--- */
|
||||||
|
|
||||||
|
typedef struct _client_tag client_t;
|
||||||
|
|
||||||
|
/* ---[ source.[ch] ]--- */
|
||||||
|
|
||||||
|
typedef struct source_tag source_t;
|
||||||
|
|
||||||
|
/* ---[ admin.[ch] ]--- */
|
||||||
|
|
||||||
|
/* Command IDs */
|
||||||
|
typedef int32_t admin_command_id_t;
|
||||||
|
|
||||||
|
/* formats */
|
||||||
|
typedef enum {
|
||||||
|
ADMIN_FORMAT_AUTO,
|
||||||
|
ADMIN_FORMAT_RAW,
|
||||||
|
ADMIN_FORMAT_TRANSFORMED,
|
||||||
|
ADMIN_FORMAT_PLAINTEXT
|
||||||
|
} admin_format_t;
|
||||||
|
|
||||||
|
/* ---[ acl.[ch] ]--- */
|
||||||
|
|
||||||
|
typedef struct acl_tag acl_t;
|
||||||
|
|
||||||
|
/* ---[ auth.[ch] ]--- */
|
||||||
|
|
||||||
|
typedef struct auth_tag auth_t;
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -14,8 +14,7 @@
|
|||||||
#ifndef __SOURCE_H__
|
#ifndef __SOURCE_H__
|
||||||
#define __SOURCE_H__
|
#define __SOURCE_H__
|
||||||
|
|
||||||
typedef struct source_tag source_t;
|
#include "icecasttypes.h"
|
||||||
|
|
||||||
#include "cfgfile.h"
|
#include "cfgfile.h"
|
||||||
#include "yp.h"
|
#include "yp.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user