Commit 739d544c authored by Michael Smith's avatar Michael Smith

Having both os.h and compat.h to do similar things is pointless; remove os.h

svn path=/icecast/trunk/icecast/; revision=10620
parent 4dea87dc
...@@ -6,7 +6,7 @@ SUBDIRS = avl thread httpp net log timing ...@@ -6,7 +6,7 @@ SUBDIRS = avl thread httpp net log timing
bin_PROGRAMS = icecast 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 \ 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 \ compat.h fserve.h xslt.h yp.h event.h md5.h \
auth.h auth_htpasswd.h auth_url.h \ auth.h auth_htpasswd.h auth_url.h \
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "global.h" #include "global.h"
#include "event.h" #include "event.h"
#include "stats.h" #include "stats.h"
#include "os.h" #include "compat.h"
#include "xslt.h" #include "xslt.h"
#include "fserve.h" #include "fserve.h"
......
...@@ -20,12 +20,23 @@ ...@@ -20,12 +20,23 @@
* Solaris. * Solaris.
*/ */
#ifdef _WIN32
#include <windows.h>
#else
#include <unistd.h>
#endif
/* Make sure we define 64 bit types */ /* Make sure we define 64 bit types */
#ifdef _WIN32 #ifdef _WIN32
# define PATH_SEPARATOR "\\"
# define size_t unsigned int
# define ssize_t int
# define int64_t __int64 # define int64_t __int64
# define uint64_t unsigned __int64 # define uint64_t unsigned __int64
# define uint32_t unsigned int # define uint32_t unsigned int
#else #else
# define PATH_SEPARATOR "/"
# if defined(HAVE_STDINT_H) # if defined(HAVE_STDINT_H)
# include <stdint.h> # include <stdint.h>
# elif defined(HAVE_INTTYPES_H) # elif defined(HAVE_INTTYPES_H)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define strncasecmp strnicmp #define strncasecmp strnicmp
#endif #endif
#include "os.h" #include "compat.h"
#include "thread/thread.h" #include "thread/thread.h"
#include "avl/avl.h" #include "avl/avl.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "refbuf.h" #include "refbuf.h"
#include "client.h" #include "client.h"
#include "os.h" #include "compat.h"
#include "cfgfile.h" #include "cfgfile.h"
#include "logging.h" #include "logging.h"
#include "util.h" #include "util.h"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "sighandler.h" #include "sighandler.h"
#include "global.h" #include "global.h"
#include "os.h" #include "compat.h"
#include "connection.h" #include "connection.h"
#include "refbuf.h" #include "refbuf.h"
#include "client.h" #include "client.h"
......
/* 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 @@ ...@@ -39,7 +39,7 @@
#define strncasecmp strnicmp #define strncasecmp strnicmp
#endif #endif
#include "os.h" #include "compat.h"
#include "thread/thread.h" #include "thread/thread.h"
#include "avl/avl.h" #include "avl/avl.h"
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include "format.h" #include "format.h"
#include "fserve.h" #include "fserve.h"
#include "auth.h" #include "auth.h"
#include "os.h" #include "compat.h"
#undef CATMODULE #undef CATMODULE
#define CATMODULE "source" #define CATMODULE "source"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "cfgfile.h" #include "cfgfile.h"
#include "util.h" #include "util.h"
#include "os.h" #include "compat.h"
#include "refbuf.h" #include "refbuf.h"
#include "connection.h" #include "connection.h"
#include "client.h" #include "client.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment