[xiph-commits] r10620 - icecast/trunk/icecast/src
msmith at svn.xiph.org
msmith at svn.xiph.org
Sat Dec 17 04:41:42 PST 2005
Author: msmith
Date: 2005-12-17 04:41:34 -0800 (Sat, 17 Dec 2005)
New Revision: 10620
Removed:
icecast/trunk/icecast/src/os.h
Modified:
icecast/trunk/icecast/src/Makefile.am
icecast/trunk/icecast/src/admin.c
icecast/trunk/icecast/src/compat.h
icecast/trunk/icecast/src/connection.c
icecast/trunk/icecast/src/logging.c
icecast/trunk/icecast/src/main.c
icecast/trunk/icecast/src/slave.c
icecast/trunk/icecast/src/source.c
icecast/trunk/icecast/src/util.c
Log:
Having both os.h and compat.h to do similar things is pointless; remove os.h
Modified: icecast/trunk/icecast/src/Makefile.am
===================================================================
--- icecast/trunk/icecast/src/Makefile.am 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/Makefile.am 2005-12-17 12:41:34 UTC (rev 10620)
@@ -6,7 +6,7 @@
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 \
Modified: icecast/trunk/icecast/src/admin.c
===================================================================
--- icecast/trunk/icecast/src/admin.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/admin.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -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"
Modified: icecast/trunk/icecast/src/compat.h
===================================================================
--- icecast/trunk/icecast/src/compat.h 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/compat.h 2005-12-17 12:41:34 UTC (rev 10620)
@@ -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)
Modified: icecast/trunk/icecast/src/connection.c
===================================================================
--- icecast/trunk/icecast/src/connection.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/connection.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -34,7 +34,7 @@
#define strncasecmp strnicmp
#endif
-#include "os.h"
+#include "compat.h"
#include "thread/thread.h"
#include "avl/avl.h"
Modified: icecast/trunk/icecast/src/logging.c
===================================================================
--- icecast/trunk/icecast/src/logging.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/logging.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -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"
Modified: icecast/trunk/icecast/src/main.c
===================================================================
--- icecast/trunk/icecast/src/main.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/main.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -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"
Deleted: icecast/trunk/icecast/src/os.h
===================================================================
--- icecast/trunk/icecast/src/os.h 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/os.h 2005-12-17 12:41:34 UTC (rev 10620)
@@ -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 at xiph.org,
- * Michael Smith <msmith at xiph.org>,
- * oddsock <oddsock at xiph.org>,
- * Karl Heyes <karl at 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__ */
Modified: icecast/trunk/icecast/src/slave.c
===================================================================
--- icecast/trunk/icecast/src/slave.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/slave.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -39,7 +39,7 @@
#define strncasecmp strnicmp
#endif
-#include "os.h"
+#include "compat.h"
#include "thread/thread.h"
#include "avl/avl.h"
Modified: icecast/trunk/icecast/src/source.c
===================================================================
--- icecast/trunk/icecast/src/source.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/source.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -50,7 +50,7 @@
#include "format.h"
#include "fserve.h"
#include "auth.h"
-#include "os.h"
+#include "compat.h"
#undef CATMODULE
#define CATMODULE "source"
Modified: icecast/trunk/icecast/src/util.c
===================================================================
--- icecast/trunk/icecast/src/util.c 2005-12-17 12:36:08 UTC (rev 10619)
+++ icecast/trunk/icecast/src/util.c 2005-12-17 12:41:34 UTC (rev 10620)
@@ -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"
More information about the commits
mailing list