Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
Icecast-Server
Commits
4327a10e
Commit
4327a10e
authored
Feb 07, 2002
by
Jack Moffitt
Browse files
minor build fixes for win32 courtesy of Oddsock
svn path=/trunk/icecast/; revision=3029
parent
ab0f4cdd
Changes
10
Hide whitespace changes
Inline
Side-by-side
src/connection.c
View file @
4327a10e
...
...
@@ -9,8 +9,10 @@
#include <sys/socket.h>
#include <netinet/in.h>
#else
#include <winsock2.h>
#define snprintf _snprintf
#define strcasecmp stricmp
#define strncasecmp strnicmp
#endif
#include "os.h"
...
...
src/logging.h
View file @
4327a10e
...
...
@@ -13,6 +13,10 @@ extern int accesslog;
** feel free to add more here if needed.
*/
#ifdef _WIN32
#define __FUNCTION__ __FILE__ ":" __LINE__
#endif
#define ERROR0(y) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y)
#define ERROR1(y, a) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y, a)
#define ERROR2(y, a, b) log_write(errorlog, 1, CATMODULE "/" __FUNCTION__, y, a, b)
...
...
src/net/resolver.c
View file @
4327a10e
...
...
@@ -8,16 +8,16 @@
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <netdb.h>
#include <string.h>
#ifndef _WIN32
#include <netdb.h>
#include <sys/socket.h>
#include <pthread.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#else
#include <winsock.h>
#include <winsock
2
.h>
#define sethostent(x)
#endif
...
...
src/net/sock.h
View file @
4327a10e
...
...
@@ -24,11 +24,10 @@
#ifdef _WIN32
#include <winsock2.h>
typedef
SOCKET
sock_t
#else
typedef
int
sock_t
;
#endif
typedef
int
sock_t
;
#define SOCK_ERROR -1
#define SOCK_BLOCK 0
#define SOCK_NONBLOCK 1
...
...
src/os.h
View file @
4327a10e
...
...
@@ -8,7 +8,7 @@
#endif
#ifdef _WIN32
#define PATH_
D
EPARATOR "\\"
#define PATH_
S
EPARATOR "\\"
#else
#define PATH_SEPARATOR "/"
#endif
...
...
src/source.c
View file @
4327a10e
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <ogg/ogg.h>
#ifndef _WIN32
#include <unistd.h>
#include <sys/time.h>
#include <sys/socket.h>
#else
#include <window.h>
#include <winsock2.h>
#include <windows.h>
#endif
#include "thread.h"
...
...
@@ -23,6 +24,7 @@
#include "client.h"
#include "stats.h"
#include "format.h"
#include "log.h"
#include "logging.h"
#include "config.h"
...
...
src/thread/thread.c
View file @
4327a10e
...
...
@@ -28,6 +28,9 @@
#ifndef _WIN32
#include <unistd.h>
#include <sys/time.h>
#else
#include <windows.h>
#include <winbase.h>
#endif
#include <pthread.h>
...
...
@@ -38,6 +41,10 @@
#include "thread.h"
#include "avl.h"
#ifdef _WIN32
#define __FUNCTION__ __FILE__ ":" __LINE__
#endif
#define CATMODULE "thread"
#define LOG_ERROR(y) log_write(_logid, 1, CATMODULE "/" __FUNCTION__, y)
#define LOG_ERROR3(y, z1, z2, z3) log_write(_logid, 1, CATMODULE "/" __FUNCTION__, y, z1, z2, z3)
...
...
src/timing/timing.c
View file @
4327a10e
...
...
@@ -4,14 +4,16 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
#ifdef _WIN32
# include <mmsystem.h>
#include <windows.h>
#include <mmsystem.h>
#else
#include <sys/time.h>
#include <unistd.h>
#endif
#include "timing.h"
...
...
src/timing/timing.h
View file @
4327a10e
...
...
@@ -3,11 +3,12 @@
#include <sys/types.h>
#ifdef HAVE_STDINT_H
#
include <stdint.h>
#include <stdint.h>
#endif
#ifdef _WIN32
typedef
int64
_t
__
int64
;
typedef
uint64_t
unsigned
__int64
;
typedef
__
int64
int64
_t
;
typedef
unsigned
__int64
uint64_t
;
#endif
uint64_t
timing_get_time
(
void
);
...
...
src/util.c
View file @
4327a10e
...
...
@@ -5,6 +5,7 @@
#include <sys/socket.h>
#include <unistd.h>
#else
#include <winsock2.h>
#include <windows.h>
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment