mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2025-06-30 22:18:19 -04:00
Having both os.h and compat.h to do similar things is pointless; remove os.h
svn path=/icecast/trunk/icecast/; revision=10620
This commit is contained in:
parent
4dea87dca7
commit
739d544c34
@ -6,7 +6,7 @@ SUBDIRS = avl thread httpp net log timing
|
||||
|
||||
bin_PROGRAMS = icecast
|
||||
|
||||
noinst_HEADERS = admin.h cfgfile.h os.h logging.h sighandler.h connection.h \
|
||||
noinst_HEADERS = admin.h cfgfile.h logging.h sighandler.h connection.h \
|
||||
global.h util.h slave.h source.h stats.h refbuf.h client.h \
|
||||
compat.h fserve.h xslt.h yp.h event.h md5.h \
|
||||
auth.h auth_htpasswd.h auth_url.h \
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include "global.h"
|
||||
#include "event.h"
|
||||
#include "stats.h"
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
#include "xslt.h"
|
||||
#include "fserve.h"
|
||||
|
||||
|
11
src/compat.h
11
src/compat.h
@ -20,12 +20,23 @@
|
||||
* Solaris.
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* Make sure we define 64 bit types */
|
||||
#ifdef _WIN32
|
||||
# define PATH_SEPARATOR "\\"
|
||||
# define size_t unsigned int
|
||||
# define ssize_t int
|
||||
# define int64_t __int64
|
||||
# define uint64_t unsigned __int64
|
||||
# define uint32_t unsigned int
|
||||
#else
|
||||
# define PATH_SEPARATOR "/"
|
||||
# if defined(HAVE_STDINT_H)
|
||||
# include <stdint.h>
|
||||
# elif defined(HAVE_INTTYPES_H)
|
||||
|
@ -34,7 +34,7 @@
|
||||
#define strncasecmp strnicmp
|
||||
#endif
|
||||
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
|
||||
#include "thread/thread.h"
|
||||
#include "avl/avl.h"
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "refbuf.h"
|
||||
#include "client.h"
|
||||
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
#include "cfgfile.h"
|
||||
#include "logging.h"
|
||||
#include "util.h"
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include "sighandler.h"
|
||||
|
||||
#include "global.h"
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
#include "connection.h"
|
||||
#include "refbuf.h"
|
||||
#include "client.h"
|
||||
|
30
src/os.h
30
src/os.h
@ -1,30 +0,0 @@
|
||||
/* Icecast
|
||||
*
|
||||
* This program is distributed under the GNU General Public License, version 2.
|
||||
* A copy of this license is included with this source.
|
||||
*
|
||||
* Copyright 2000-2004, Jack Moffitt <jack@xiph.org,
|
||||
* Michael Smith <msmith@xiph.org>,
|
||||
* oddsock <oddsock@xiph.org>,
|
||||
* Karl Heyes <karl@xiph.org>
|
||||
* and others (see AUTHORS for details).
|
||||
*/
|
||||
|
||||
#ifndef __OS_H__
|
||||
#define __OS_H__
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define PATH_SEPARATOR "\\"
|
||||
#define size_t unsigned int
|
||||
#define ssize_t int
|
||||
#else
|
||||
#define PATH_SEPARATOR "/"
|
||||
#endif
|
||||
|
||||
#endif /* __OS_H__ */
|
@ -39,7 +39,7 @@
|
||||
#define strncasecmp strnicmp
|
||||
#endif
|
||||
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
|
||||
#include "thread/thread.h"
|
||||
#include "avl/avl.h"
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include "format.h"
|
||||
#include "fserve.h"
|
||||
#include "auth.h"
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
|
||||
#undef CATMODULE
|
||||
#define CATMODULE "source"
|
||||
|
@ -40,7 +40,7 @@
|
||||
|
||||
#include "cfgfile.h"
|
||||
#include "util.h"
|
||||
#include "os.h"
|
||||
#include "compat.h"
|
||||
#include "refbuf.h"
|
||||
#include "connection.h"
|
||||
#include "client.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user