aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-06-16 06:15:24 +00:00
Code

minor build fixes for win32 courtesy of Oddsock

Browse Source 
svn path=/trunk/net/; revision=3029
This commit is contained in:
Jack Moffitt 2002-02-07 01:04:09 +00:00
parent 1e98ffc080
commit c334915e67
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/resolver.c
View File

@ -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 <winsock2.h>
#define sethostent(x)
#endif

5
net/sock.h
View File

@ -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

7
thread/thread.c
View File

@ -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)

8
timing/timing.c
View File

@ -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"

7
timing/timing.h
View File

@ -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);