diff --git a/src/Makefile.am b/src/Makefile.am index 1b41e1a622e2e1850128288605022b3fca3f4361..8db2e5c383c6a346ad21ac62e1ac1b5e86bf7ab8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 \ diff --git a/src/admin.c b/src/admin.c index 3db88c21afaaa794ff1b374e300358828ff7dc64..4adc582a5a5849f27064772ef69171f6d7a8feb3 100644 --- a/src/admin.c +++ b/src/admin.c @@ -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" diff --git a/src/compat.h b/src/compat.h index 6cfb6450a8a27c446bfc9e3953cf5e3819731f84..50691f49d9c9849430f656881bf21c3171a90761 100644 --- a/src/compat.h +++ b/src/compat.h @@ -20,12 +20,23 @@ * Solaris. */ +#ifdef _WIN32 +#include +#else +#include +#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 # elif defined(HAVE_INTTYPES_H) diff --git a/src/connection.c b/src/connection.c index f5924ffddf843b4a0fae69d9abab7eb00c6578eb..290673b3948a3ab6ba434a443044eed9adc894c6 100644 --- a/src/connection.c +++ b/src/connection.c @@ -34,7 +34,7 @@ #define strncasecmp strnicmp #endif -#include "os.h" +#include "compat.h" #include "thread/thread.h" #include "avl/avl.h" diff --git a/src/logging.c b/src/logging.c index 786e76cbcc97f9bb62c0a40b7979c2eb2cba507f..ed883e5dbc1094370f5b21460df0efe07f6d7e6e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -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" diff --git a/src/main.c b/src/main.c index 25328ab166178e2fc566c35796836917dfc9316a..86137e231b5cb3729afe35810050865b78a51ef7 100644 --- a/src/main.c +++ b/src/main.c @@ -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" diff --git a/src/os.h b/src/os.h deleted file mode 100644 index d74d88d03cae951a379c9aeee4531533edc36f80..0000000000000000000000000000000000000000 --- a/src/os.h +++ /dev/null @@ -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 , - * oddsock , - * Karl Heyes - * and others (see AUTHORS for details). - */ - -#ifndef __OS_H__ -#define __OS_H__ - -#ifdef _WIN32 -#include -#else -#include -#endif - -#ifdef _WIN32 -#define PATH_SEPARATOR "\\" -#define size_t unsigned int -#define ssize_t int -#else -#define PATH_SEPARATOR "/" -#endif - -#endif /* __OS_H__ */ diff --git a/src/slave.c b/src/slave.c index ece0859dbba0727823162d6c7150674083d7399d..de1f8eb64539da8e318f4a46e26e9ae264f8677a 100644 --- a/src/slave.c +++ b/src/slave.c @@ -39,7 +39,7 @@ #define strncasecmp strnicmp #endif -#include "os.h" +#include "compat.h" #include "thread/thread.h" #include "avl/avl.h" diff --git a/src/source.c b/src/source.c index 7be2f6dd8479de5e8b654f2badd44d41da680427..0be562a2fbb983889b29369f3a6acc95f9a1ecd4 100644 --- a/src/source.c +++ b/src/source.c @@ -50,7 +50,7 @@ #include "format.h" #include "fserve.h" #include "auth.h" -#include "os.h" +#include "compat.h" #undef CATMODULE #define CATMODULE "source" diff --git a/src/util.c b/src/util.c index aa922ef38680366ffd15c7225ac9472dbb8bf6ce..3aa14730c0cccc6c0a1b48c547b82d87a43f650d 100644 --- a/src/util.c +++ b/src/util.c @@ -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"